Merge pull request #16 from codefresh-io/move-to-quay

Dockerfile

@@ -9,16 +9,17 @@ WORKDIR /app
 COPY ./ ./
 RUN go build -o ./cf-argo-plugin
 
-FROM alpine
-RUN apk --update add curl bash
-RUN curl -L https://github.com/argoproj/argo-rollouts/releases/latest/download/kubectl-argo-rollouts-linux-amd64 -o /usr/local/bin/kubectl-argo-rollouts
-RUN chmod +x /usr/local/bin/kubectl-argo-rollouts
-
-RUN curl -L https://storage.googleapis.com/kubernetes-release/release/v1.17.4/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl
-RUN chmod +x /usr/local/bin/kubectl
-
-RUN curl -sSL https://github.com/argoproj/argo-cd/releases/download/v1.8.5/argocd-linux-amd64 -o /usr/local/bin/argocd
-RUN chmod +x /usr/local/bin/argocd
+FROM debian:11-slim
+RUN apt-get update -y && apt-get install wget bash -y  \
+    && wget -O /usr/local/bin/kubectl-argo-rollouts https://github.com/argoproj/argo-rollouts/releases/download/v1.5.0/kubectl-argo-rollouts-linux-amd64 \
+    && chmod +x /usr/local/bin/kubectl-argo-rollouts \
+    && wget -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.17.4/bin/linux/amd64/kubectl \
+    && chmod +x /usr/local/bin/kubectl \
+    && wget -O /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/download/v2.7.1/argocd-linux-amd64 \
+    && chmod +x /usr/local/bin/argocd \
+    && apt-get install busybox -y && ln -s /bin/busybox /usr/bin/[[ \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY --from=build /app/cf-argo-plugin /usr/local/bin/cf-argo-plugin
 ENTRYPOINT /bin/bash

VERSION

@@ -1 +1 @@
-0.2.1
+1.1.1

cmd/processResult/wait_rollout.go

@@ -8,6 +8,7 @@ import (
 var waitRolloutArgsOptions struct {
 	PipelineId string
 	BuildId    string
+	Skip       bool
 }
 
 var WaitRolloutCmd = &cobra.Command{
@@ -18,6 +19,9 @@ var WaitRolloutCmd = &cobra.Command{
 			fmt.Println("Wrong amount of arguments")
 			return nil
 		}
+		if waitRolloutArgsOptions.Skip {
+			return nil
+		}
 		return GetWaitRolloutHandler().Handle(args[0])
 	},
 }
@@ -26,4 +30,5 @@ func init() {
 	f := WaitRolloutCmd.Flags()
 	f.StringVar(&waitRolloutArgsOptions.PipelineId, "pipeline-id", "", "Pipeline id where argo sync was executed")
 	f.StringVar(&waitRolloutArgsOptions.BuildId, "build-id", "", "Build id where argo sync was executed")
+	f.BoolVar(&waitRolloutArgsOptions.Skip, "skip", false, "Skip wait rollout step")
 }

cmd/processResult/wait_rollout_handler.go

@@ -33,7 +33,7 @@ func GetWaitRolloutHandler() *WaitRolloutHandler {
 	})}
 }
 
-func (waitRolloutHandler *WaitRolloutHandler) processNewHistoryId(historyId int64, name string) error {
+func (waitRolloutHandler *WaitRolloutHandler) processNewHistoryId(historyId int64, name string, integration string) error {
 	fmt.Println(fmt.Sprintf("Found new history id %v", historyId))
 
 	// wait before activity on codefresh will be created
@@ -45,6 +45,7 @@ func (waitRolloutHandler *WaitRolloutHandler) processNewHistoryId(historyId int6
 		BuildId:         waitRolloutArgsOptions.BuildId,
 		HistoryId:       historyId,
 		ApplicationName: name,
+		Integration:     integration,
 	})
 
 	if updatedActivities != nil {
@@ -73,7 +74,7 @@ func (waitRolloutHandler *WaitRolloutHandler) Handle(name string) error {
 		currentHistoryId, _ := waitRolloutHandler.argo.GetLatestHistoryId(name)
 		// we identify new rollout
 		if currentHistoryId > historyId {
-			err := waitRolloutHandler.processNewHistoryId(currentHistoryId, name)
+			err := waitRolloutHandler.processNewHistoryId(currentHistoryId, name, context.PluginCodefreshCredentials.Integration)
 			if err == nil {
 				return nil
 			}

cmd/processResult/wait_rollout_test.go

@@ -37,7 +37,7 @@ func (a *MockArgo) GetLatestHistoryId(application string) (int64, error) {
 
 func TestHandleWaitRollout(t *testing.T) {
 	handler := &WaitRolloutHandler{codefresh: &MockCodefresh{}, argo: &MockArgo{}}
-	e := handler.processNewHistoryId(123, "test")
+	e := handler.processNewHistoryId(123, "test", "123")
 	if e == nil {
 		t.Error("Should fail with error")
 	}

cmd/rollout/rollout.go

@@ -36,7 +36,7 @@ var Cmd = &cobra.Command{
 			}
 		}
 		b.ExportExternalUrl(context.PluginArgoCredentials.Host, name)
-		b.Rollout(rolloutArgs, name, context.PluginArgoCredentials.Token, context.PluginArgoCredentials.Host, context.PluginCodefreshCredentials.Integration)
+		b.Rollout(rolloutArgs, name, context.PluginArgoCredentials.Token, context.PluginArgoCredentials.Host, context.PluginCodefreshCredentials.Integration, rolloutArgs.SkipWaitRollout)
 
 		resultCommands := strings.Join(b.GetLines()[:], "\n")
 		resultExportCommands := strings.Join(b.GetExportLines()[:], "\n")
@@ -96,6 +96,7 @@ func init() {
 	f.BoolVar(&rolloutArgs.WaitHealthy, "wait-healthy", true, "Specify whether to wait for sync to be completed (in canary consider wait for suspended status)")
 	f.StringVar(&rolloutArgs.WaitAdditionalFlags, "wait-additional-flags", "", "Specify additional flags for wait command, like --timeout , so on")
 	f.BoolVar(&rolloutArgs.Debug, "debug", false, "Debug argocd command ( print commands to output )")
+	f.BoolVar(&rolloutArgs.SkipWaitRollout, "skip", false, "Skip wait rollout")
 
 	_ = cobra.MarkFlagRequired(f, "k8s-context")
 	_ = cobra.MarkFlagRequired(f, "rollout-name")

cmd/root/root.go

@@ -21,6 +21,8 @@ type authContext struct {
 	ArgoPassword string
 	ArgoHost     string
 	ArgoToken    string
+
+	BasicAuth bool
 }
 
 var pluginAuthContext = &authContext{}
@@ -49,9 +51,11 @@ func init() {
 	pf.StringVar(&pluginAuthContext.ArgoPassword, "argo-password", "", "Password for argo cd, use only if you not provide integration")
 	pf.StringVar(&pluginAuthContext.ArgoToken, "argo-token", "", "Token for argo cd, use only if you not provide integration")
 	pf.StringVar(&pluginAuthContext.ArgoHost, "argo-host", "", "Host for argo cd, use only if you not provide integration")
+	pf.BoolVar(&pluginAuthContext.BasicAuth, "basic-auth", false, "Use ArgoCD username/password as primary credentials")
 
 	pf.StringVar(&context.PluginOutConfig.CommandsFile, "out-commands-file", "", "Write main commands to file")
 	pf.StringVar(&context.PluginOutConfig.ExportOutUrlCommand, "out-export-file", "", "Write export commands to file")
+	pf.StringVar(&context.PluginOutConfig.CustomOutputUrl, "custom-external-link", "", "Custom link that Codefresh is showing inside build view")
 
 	rootCmd.AddCommand(sync.Cmd)
 	rootCmd.AddCommand(rollout.Cmd)
@@ -83,8 +87,13 @@ func fetchArgoCredentials(cmd *cobra.Command, args []string) error {
 		context.PluginArgoCredentials.Username = integration.Data.Username
 		context.PluginArgoCredentials.Password = integration.Data.Password
 		context.PluginArgoCredentials.Token = integration.Data.Token
+	} else if pluginAuthContext.ArgoToken != "" && pluginAuthContext.ArgoHost != "" {
+		context.PluginArgoCredentials.Token = pluginAuthContext.ArgoToken
+		context.PluginArgoCredentials.Host = pluginAuthContext.ArgoHost
 	}
 
+	context.PluginArgoCredentials.BasicAuth = pluginAuthContext.BasicAuth
+
 	return nil
 }
 

cmd/sync/sync.go

@@ -19,15 +19,21 @@ var Cmd = &cobra.Command{
 		name := args[0]
 
 		b := builder.New()
-		if context.PluginArgoCredentials.Token == "" {
+		if context.PluginArgoCredentials.Token == "" || context.PluginArgoCredentials.BasicAuth {
+			fmt.Println("Generate token use basic auth")
 			err := b.Auth(context.PluginArgoCredentials.Host, context.PluginArgoCredentials.Username, context.PluginArgoCredentials.Password)
 			if err != nil {
 				return err
 			}
 		}
 
-		b.ExportExternalUrl(context.PluginArgoCredentials.Host, name)
-		b.Sync(syncArgs, name, context.PluginArgoCredentials.Token, context.PluginArgoCredentials.Host, context.PluginCodefreshCredentials.Integration)
+		if context.PluginOutConfig.CustomOutputUrl == "" {
+			b.ExportExternalUrl(context.PluginArgoCredentials.Host, name)
+		} else {
+			b.ExportCustomExternalUrl(context.PluginOutConfig.CustomOutputUrl)
+		}
+
+		b.Sync(syncArgs, name, context.PluginArgoCredentials.Token, context.PluginArgoCredentials.Host, context.PluginCodefreshCredentials.Integration, syncArgs.SkipWaitRollout)
 
 		resultCommands := strings.Join(b.GetLines()[:], "\n")
 		resultExportCommands := strings.Join(b.GetExportLines()[:], "\n")
@@ -89,5 +95,6 @@ func init() {
 	f.StringVar(&syncArgs.AdditionalFlags, "additional-flags", "", "Specify additional flags , like --grpc-web , so on")
 	f.StringVar(&syncArgs.WaitAdditionalFlags, "wait-additional-flags", "", "Specify additional flags for wait command, like --timeout , so on")
 	f.StringVar(&syncArgs.Revision, "revision", "", "Sync to a specific revision. Preserves parameter overrides")
-
+	f.BoolVar(&syncArgs.SkipWaitRollout, "skip", false, "Skip wait rollout")
+	f.BoolVar(&syncArgs.Rollback, "rollback", false, "Specify whether to wait for sync to run rollback after sync")
 }

codefresh.yaml

@@ -20,16 +20,8 @@ steps:
     working_directory: ${{main_clone}}
     image: golang:1.14.2
     commands:
-      - go get -u github.com/mcubik/goverreport
       - go test ./... -coverpkg=./... -race -coverprofile=coverage.out -covermode=atomic
 
-  codecov-report:
-    stage: "prepare"
-    title: Codecov report
-    type: codecov-reporter
-    arguments:
-      codecov_integration: cf-argo-plugin
-
   fetch_envs:
     stage: prepare
     title: "Fetch envs"
@@ -45,10 +37,7 @@ steps:
     dockerfile: "Dockerfile"
     stage: "build"
 
-
-
-
-PushingToRegistries_with_tag:
+  PushingToRegistries_with_tag:
     title: Pushing to Registry
     type: push
     candidate: ${{build}}
@@ -64,26 +53,23 @@ PushingToRegistries_with_tag:
         registry: cfpluginmgr-quay
         image_name: codefreshplugins/cf-argo-plugin
 
-
   PushingToRegistries:
-    title: Pushing to Registry
+    title: Pushing to Registry only master
     type: push
     candidate: ${{build}}
     tags:
       - ${{VERSION}}
+      - latest
     when:
       branch:
         only:
           - master
     scale:
-      PushingToDockerHubRegistry:
+      PushingToDockerHubRegistry2:
         title: Pushing To DockerHub Registry
         registry: dockerhub
         image_name: codefresh/cf-argo-plugin
-      PushingToQuayRegistry:
+      PushingToQuayRegistry2:
         title: Pushing To Quay Registry
-        registry: cfpluginmgr-quay
-        image_name: codefreshplugins/cf-argo-plugin
-
-
-
+        registry: cf-quay
+        image_name: codefresh/cf-argo-plugin

pkg/builder/builder.go

@@ -7,13 +7,15 @@ import (
 
 type SyncArgs struct {
 	Sync                bool
+	Rollback            bool
 	WaitHealthy         bool
 	WaitForSuspend      bool
 	Debug               bool
 	Prune               bool
 	AdditionalFlags     string
 	Revision            string
 	WaitAdditionalFlags string
+	SkipWaitRollout     bool
 }
 
 type RolloutArgs struct {
@@ -23,13 +25,15 @@ type RolloutArgs struct {
 	WaitHealthy         bool
 	WaitAdditionalFlags string
 	Debug               bool
+	SkipWaitRollout     bool
 }
 
 type Builder interface {
 	Auth(host string, username string, password string) error
-	Sync(args *SyncArgs, name string, authToken string, host string, context string)
+	Sync(args *SyncArgs, name string, authToken string, host string, context string, skip bool)
 	ExportExternalUrl(host string, name string)
-	Rollout(args *RolloutArgs, name string, authToken string, host string, context string)
+	ExportCustomExternalUrl(url string)
+	Rollout(args *RolloutArgs, name string, authToken string, host string, context string, skip bool)
 
 	GetLines() []string
 	GetExportLines() []string
@@ -64,12 +68,12 @@ func buildTokenFlags(authToken string, host string, prune bool) string {
 	return cmd
 }
 
-func (b *builder) Sync(args *SyncArgs, name string, authToken string, host string, context string) {
+func (b *builder) Sync(args *SyncArgs, name string, authToken string, host string, context string, skip bool) {
 	hostDomain, _ := getHostDomain(host)
 	tokenFlags := buildTokenFlags(authToken, *hostDomain, args.Prune)
 	tokenFlagsWithoutPrune := buildTokenFlags(authToken, *hostDomain, false)
 	if args.WaitHealthy || args.WaitForSuspend {
-		b.lines = append(b.lines, GetCommandsFactory().CreateWaitRolloutCMD(name, context))
+		b.lines = append(b.lines, GetCommandsFactory().CreateWaitRolloutCMD(name, context, skip))
 	}
 
 	if args.Sync {
@@ -88,6 +92,7 @@ func (b *builder) Sync(args *SyncArgs, name string, authToken string, host strin
         }
         if [[ $? -ne 0 ]]; then
 		  ARGO_SYNC_ERROR=$(cat /codefresh/volume/sync_error.log | grep -i fatal)
+		  ARGO_SYNC_FAILED=1
 		fi
 		echo ARGO_SYNC_ERROR="$ARGO_SYNC_ERROR"
 		cf_export ARGO_SYNC_ERROR="$ARGO_SYNC_ERROR"
@@ -96,20 +101,26 @@ func (b *builder) Sync(args *SyncArgs, name string, authToken string, host strin
         `, name, args.WaitAdditionalFlags, tokenFlagsWithoutPrune)
 		b.lines = append(b.lines, cmd)
 	}
+	if args.WaitHealthy && args.Rollback != true {
+		failedSyncCmd := fmt.Sprintf(`        if [[ -v ARGO_SYNC_FAILED ]]; then
+		  exit 1
+        fi`)
+		b.lines = append(b.lines, failedSyncCmd)
+	}
 	if args.WaitForSuspend {
 		b.lines = append(b.lines, fmt.Sprintf("argocd app wait %s %s --suspended", name, tokenFlagsWithoutPrune))
 	}
 }
 
-func (b *builder) Rollout(args *RolloutArgs, name string, authToken string, host string, context string) {
+func (b *builder) Rollout(args *RolloutArgs, name string, authToken string, host string, context string, skip bool) {
 	hostDomain, _ := getHostDomain(host)
 	b.lines = append(b.lines, "kubectl config get-contexts")
 	b.lines = append(b.lines, fmt.Sprintf("kubectl config use-context \"%s\"", args.KubernetesContext))
 	b.lines = append(b.lines, fmt.Sprintf("kubectl argo rollouts promote \"%s\" -n \"%s\"", args.RolloutName, args.RolloutNamespace))
 
 	if args.WaitHealthy {
 		if context != "" {
-			b.lines = append(b.lines, GetCommandsFactory().CreateWaitRolloutCMD(name, context))
+			b.lines = append(b.lines, GetCommandsFactory().CreateWaitRolloutCMD(name, context, skip))
 		}
 		tokenFlags := buildTokenFlags(authToken, *hostDomain, false)
 		b.lines = append(b.lines, fmt.Sprintf("argocd app wait %s %s %s", name, args.WaitAdditionalFlags, tokenFlags))
@@ -131,6 +142,12 @@ func (b *builder) ExportExternalUrl(host string, name string) {
 	b.exportLines = append(b.exportLines, command)
 }
 
+func (b *builder) ExportCustomExternalUrl(url string) {
+	command := fmt.Sprintf("cf_export runArgoCd_CF_OUTPUT_URL=\"%s\"", url)
+	b.lines = append(b.lines, command)
+	b.exportLines = append(b.exportLines, command)
+}
+
 func getHostDomain(host string) (*string, error) {
 	u, err := url.Parse(host)
 	if err != nil {