Skip to content

Commit 07b1df4

Browse files
ref(gitreceive): remove push hook (#407)
It was used for authorization, but the keys hook is now used for both authentication and authorization
1 parent 0690f89 commit 07b1df4

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

pkg/gitreceive/build.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/deis/builder/pkg/k8s"
1717
"github.com/deis/builder/pkg/storage"
1818
"github.com/deis/builder/pkg/sys"
19-
"github.com/deis/controller-sdk-go"
2019
deisAPI "github.com/deis/controller-sdk-go/api"
2120
"github.com/deis/controller-sdk-go/hooks"
2221
"github.com/deis/pkg/log"
@@ -47,7 +46,6 @@ func run(cmd *exec.Cmd) error {
4746
}
4847

4948
func build(
50-
client *deis.Client,
5149
conf *Config,
5250
storageDriver storagedriver.StorageDriver,
5351
kubeClient *client.Client,
@@ -94,6 +92,11 @@ func build(
9492

9593
slugBuilderInfo := NewSlugBuilderInfo(slugName)
9694

95+
client, err := controller.New()
96+
if err != nil {
97+
return err
98+
}
99+
97100
// Get the application config from the controller, so we can check for a custom buildpack URL
98101
appConf, err := hooks.GetAppConfig(client, conf.Username, appName)
99102
if controller.CheckAPICompat(client, err) != nil {

pkg/gitreceive/run.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import (
77
"strings"
88

99
builderconf "github.com/deis/builder/pkg/conf"
10-
"github.com/deis/builder/pkg/controller"
1110
"github.com/deis/builder/pkg/sys"
12-
"github.com/deis/controller-sdk-go/hooks"
1311
"github.com/deis/pkg/log"
1412
storagedriver "github.com/docker/distribution/registry/storage/driver"
1513

@@ -50,19 +48,9 @@ func Run(conf *Config, fs sys.FS, env sys.Env, storageDriver storagedriver.Stora
5048

5149
log.Debug("read [%s,%s,%s]", oldRev, newRev, refName)
5250

53-
client, err := controller.New()
54-
if err != nil {
55-
return err
56-
}
57-
58-
if err := hooks.CreatePush(client, conf.Username, conf.App(), newRev, conf.Fingerprint,
59-
conf.SSHConnection, conf.SSHOriginalCommand); err != nil {
60-
return err
61-
}
62-
6351
// if we're processing a receive-pack on an existing repo, run a build
6452
if strings.HasPrefix(conf.SSHOriginalCommand, "git-receive-pack") {
65-
if err := build(client, conf, storageDriver, kubeClient, fs, env, builderKey, newRev); err != nil {
53+
if err := build(conf, storageDriver, kubeClient, fs, env, builderKey, newRev); err != nil {
6654
return err
6755
}
6856
}

0 commit comments

Comments
 (0)