Merge pull request #18 from sakajunquality/feature/delete-subscription

delete Pull subscription

Dockerfile

@@ -9,10 +9,8 @@ COPY go.sum .
 RUN go mod download
 
 COPY . .
-RUN go build -o /go/bin/flowd ./cmd/flowd/main.go
-RUN go build -o /go/bin/server ./cmd/server/main.go
+RUN go build -o /go/bin/server 
 
 FROM run
-COPY --from=build /go/bin/flowd /usr/local/bin/flowd
 COPY --from=build /go/bin/server /usr/local/bin/server
 CMD ["server"]

config-example.yaml

@@ -1,12 +1,11 @@
 applications:
   - name: example
-    trigger_id: xxxxxxxxxxxxxxxx
+    image_tag: gcr.io/$PROJECT_ID/foo
     source_owner: sakajunquality
     source_name: example-app
     manifest_owner: sakajunquality
     manifest_name: example-deployment
     manifest_base_branch: master
-    image_tag: gcr.io/$PROJECT_ID/hoge
     manifests:
       - env: dev
         files:

flow/config.go

@@ -8,10 +8,7 @@ type Config struct {
 }
 
 type Application struct {
-	Name string `yaml:"name"`
-
-	TriggerID string `yaml:"trigger_id"`
-
+	Name               string `yaml:"name"`
 	SourceOwner        string `yaml:"source_owner"`
 	SourceName         string `yaml:"source_name"`
 	ManifestOwner      string `yaml:"manifest_owner"`
@@ -21,7 +18,7 @@ type Application struct {
 	RewriteVersion bool `yaml:"rewrite_version"`
 	RewriteNewTag  bool `yaml:"rewrite_new_tag"`
 
-	ImageName string     `yaml:"image_tag"`
+	Image     string     `yaml:"image_tag"`
 	Manifests []Manifest `yaml:"manifests"`
 }
 

flow/flow.go

@@ -43,35 +43,6 @@ func New(c *Config) (*Flow, error) {
 	return f, nil
 }
 
-func (f *Flow) Start(ctx context.Context, errCh chan error) {
-	pubsubClient, err := pubsub.NewClient(ctx, f.projectID)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error creating pubsub client: %v.\n", err)
-	}
-
-	// Create Cloud Pub/Sub topic if not exist
-	topic := pubsubClient.Topic(pubsubTopicID)
-	exists, err := topic.Exists(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error checking for topic: %v.\n", err)
-
-	}
-
-	// Create topic subscription
-	subscription = pubsubClient.Subscription(subName)
-	exists, err = subscription.Exists(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error checking for subscription: %v.\n", err)
-	}
-	if !exists {
-		if _, err = pubsubClient.CreateSubscription(ctx, subName, pubsub.SubscriptionConfig{Topic: topic}); err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to create subscription: %v.\n", err)
-		}
-	}
-
-	go f.subscribe(ctx, errCh)
-}
-
 func (f *Flow) ProcessGCREvent(ctx context.Context, e gcrevent.Event) error {
 	if e.Action != gcrevent.ActionInsert {
 		return nil

flow/process.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 
-	"github.com/sakajunquality/cloud-pubsub-events/cloudbuildevent"
 	"github.com/sakajunquality/flow/gitbot"
 	"github.com/sakajunquality/flow/slackbot"
 )
@@ -20,34 +18,6 @@ type PullRequest struct {
 	err error
 }
 
-func (f *Flow) process(ctx context.Context, e cloudbuildevent.Event) error {
-	if !e.IsFinished() { // Notify only the finished
-		fmt.Fprintf(os.Stdout, "Build hasn't finished\n")
-		return nil
-	}
-
-	if e.TriggerID == nil {
-		return errors.New("Only the triggered build is supported")
-	}
-
-	app, err := getApplicationByEventTriggerID(*e.TriggerID)
-	if err != nil {
-		return fmt.Errorf("No app is configured for %s", *e.TriggerID)
-	}
-
-	if !e.IsSuuccess() { // CloudBuild Failure
-		return f.notifyFalure(e, "", nil)
-	}
-
-	version, err := getVersionFromImage(e.Images)
-	if err != nil {
-		return f.notifyFalure(e, fmt.Sprintf("Could not ditermine version from image: %s", err), nil)
-	}
-
-	prs := f.generatePRs(ctx, app, version)
-	return f.notifyReleasePR(e.Images[0], version, prs, app)
-}
-
 func (f *Flow) processImage(ctx context.Context, image, version string) error {
 	app, err := getApplicationByImage(image)
 	if err != nil {
@@ -122,7 +92,7 @@ func (f *Flow) createReleasePR(ctx context.Context, version string, a Applicatio
 	release := gitbot.NewRelease(*repo, a.Name, m.Env, version, prBody)
 
 	for _, filePath := range m.Files {
-		release.AddChanges(filePath, fmt.Sprintf("%s:.*", a.ImageName), fmt.Sprintf("%s:%s", a.ImageName, version))
+		release.AddChanges(filePath, fmt.Sprintf("%s:.*", a.Image), fmt.Sprintf("%s:%s", a.Image, version))
 		if a.RewriteVersion {
 			release.AddChanges(filePath, "version: .*", fmt.Sprintf("version: %s", version))
 		}
@@ -135,8 +105,6 @@ func (f *Flow) createReleasePR(ctx context.Context, version string, a Applicatio
 	// Add Commit Author
 	release.AddAuthor(cfg.GitAuthor.Name, cfg.GitAuthor.Email)
 
-	fmt.Printf("%#v", release)
-
 	// Create a release PullRequest
 	prURL, err := release.Create(ctx, f.githubToken)
 	if err != nil {
@@ -169,21 +137,6 @@ func (f *Flow) notifyReleasePR(image, version string, prs PullRequests, app *App
 	return slackbot.NewSlackMessage(f.slackBotToken, cfg.SlackNotifiyChannel, d).Post()
 }
 
-func (f *Flow) notifyFalure(e cloudbuildevent.Event, errorMessage string, app *Application) error {
-	d := slackbot.MessageDetail{
-		IsSuccess:    false,
-		ErrorMessage: errorMessage,
-		TagName:      e.TagName,
-		BranchName:   e.BranchName,
-	}
-
-	if app != nil {
-		d.AppName = app.Name
-	}
-
-	return slackbot.NewSlackMessage(f.slackBotToken, cfg.SlackNotifiyChannel, d).Post()
-}
-
 func getApplicationByEventRepoName(eventRepoName string) (*Application, error) {
 	for _, app := range cfg.ApplicationList {
 		// CloudBuild Repo Names
@@ -194,30 +147,11 @@ func getApplicationByEventRepoName(eventRepoName string) (*Application, error) {
 	return nil, errors.New("No application found for " + eventRepoName)
 }
 
-func getApplicationByEventTriggerID(eventTriggerID string) (*Application, error) {
-	for _, app := range cfg.ApplicationList {
-		if eventTriggerID == app.TriggerID {
-			return &app, nil
-		}
-	}
-	return nil, errors.New("No application found for " + eventTriggerID)
-}
-
 func getApplicationByImage(image string) (*Application, error) {
 	for _, app := range cfg.ApplicationList {
-		if image == app.ImageName {
+		if image == app.Image {
 			return &app, nil
 		}
 	}
 	return nil, errors.New("No application found for image " + image)
 }
-
-// Retrieve Docker Image tag from the built image
-func getVersionFromImage(images []string) (string, error) {
-	if len(images) < 1 {
-		return "", errors.New("no images found")
-	}
-	// does not support multiple images
-	tags := strings.Split(images[0], ":")
-	return tags[1], nil
-}