update go releaser

Signed-off-by: bupd <[email protected]>

Author: bupd

.github/workflows/docker_publish.yml

@@ -1,26 +1,11 @@
 name: Docker Publish
 
 on:
-  release:
-    types: [published]
   push:
     tags:
       - "v*"
 
 jobs:
-  github-get-tags:
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: GitHub Tag Name example
-        run: |
-          echo "Tag name from GITHUB_REF_NAME: $GITHUB_REF_NAME"
-          echo "Tag name from github.ref_name: ${{  github.ref_name }}"
-          echo "cosign password: ${{  secrets.COSIGN_PASSWORD }}"
-          echo "reg password: ${{  secrets.REGISTRY_PASSWORD  }}"
-          echo "reg password: ${{  secrets.doesnotexist  }}"
-          echo "reg username: ${{  env.REGISTRY_USERNAME }}"
-          echo "publish publish-address: ${{ vars.PUBLISH_ADDRESS }}"
   docker-publish:
     runs-on: ubuntu-latest
     permissions:
@@ -32,21 +17,11 @@ jobs:
       COSIGN_KEY: ${{ secrets.COSIGN_KEY }}
       REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
       REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+      REGISTRY_ADDRESS: ${{ vars.REGISTRY_ADDRESS }}
       PUBLISH_ADDRESS: ${{ vars.PUBLISH_ADDRESS }}
       TAG: ${{ github.ref_name }}
 
     steps:
-      - name: Debugging
-        run: |
-          echo "COSIGN_KEY: ${{ secrets.COSIGN_KEY }}"
-          echo "COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}"
-          echo "REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}"
-          echo "REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}"
-          echo "PUBLISH_ADDRESS: ${{ env.PUBLISH_ADDRESS }}"
-          echo "TAG: ${{ env.TAG }}"
-          echo "Environment Variables:"
-          env  # List all environment variables for debugging
-
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
@@ -57,4 +32,4 @@ jobs:
         with:
           version: "latest"
           verb: call
-          args: "publish-image --source=. --cosign-password='${{ env.COSIGN_PASSWORD }}' --cosign-key='${{ env.COSIGN_KEY }}' --reg-username='${{ env.REGISTRY_USERNAME }}' --reg-password='${{ env.REGISTRY_PASSWORD }}' --publish-address='${{ env.PUBLISH_ADDRESS }}' --tag='${{ env.TAG }}'"
+          args: "publish-image --source=. --cosign-password='${{ env.COSIGN_PASSWORD }}' --cosign-key='${{ env.COSIGN_KEY }}' --reg-username='${{ env.REGISTRY_USERNAME }}' --reg-password='${{ env.REGISTRY_PASSWORD }}' --reg-address='${{ env.REGISTRY_ADDRESS }}' --publish-address='${{ env.PUBLISH_ADDRESS }}' --tag='${{ env.TAG }}'"

.goreleaser.yaml

@@ -1,14 +1,15 @@
+version: 2
 project_name: harbor
 
 before:
   hooks:
     - go mod tidy
-     
+
 builds:
 - main: ./cmd/harbor/main.go
 
   env:
-    - CGO_ENABLED=0 
+    - CGO_ENABLED=0
   ldflags:
     - -w -s -X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.GitCommit={{.FullCommit}}
   goos:
@@ -18,7 +19,7 @@ builds:
   goarch:
     - amd64
     - arm64
-  ignore: 
+  ignore:
     - goos: windows
       goarch: arm
     - goos: windows
@@ -46,21 +47,27 @@ sboms:
 
 checksum:
   name_template: 'checksums.txt'
-snapshot: 
-  name_template: "{{ .Tag }}-next"
+snapshot:
+  version_template: "{{ .Tag }}-next"
 release:
   name_template: "HarborCLI {{.Tag}}"
-  # draft: true
-  # prerelease: auto
-  
+  draft: false               # Set to false to ensure that releases are published, not kept as drafts
+  prerelease: auto            # Auto-detect prereleases based on tag
+  disable: false              # Ensure release publishing is enabled
+  github:
+    owner: bupd           # Your GitHub repository owner
+    name: harbor-cli          # Your GitHub repository name
+
 changelog:
-  sort: asc
   use: github
+  format: "{{.SHA}}: {{.Message}} (@{{.AuthorUsername}})"
+  sort: asc
   filters:
     exclude:
       - "^docs:"
       - "^test:"
       - "merge conflict"
+
   groups:
     - title: Dependency updates
       regexp: '^.*?(.+)\(deps\)!?:.+$'
@@ -81,4 +88,4 @@ changelog:
       regexp: ^.*?(build|ci)(\(.+\))??!?:.+$
       order: 400
     - title: Other work
-      order: 9999
+      order: 9999

dagger/main.go

@@ -11,7 +11,7 @@ const (
 	GOLANGCILINT_VERSION = "v1.61.0"
 	GO_VERSION           = "1.22.5"
 	SYFT_VERSION         = "v1.9.0"
-	GORELEASER_VERSION   = "v2.1.0"
+	GORELEASER_VERSION   = "v2.3.2"
 )
 
 type HarborCli struct{}
@@ -89,7 +89,7 @@ func (m *HarborCli) Release(
 	source *dagger.Directory,
 	githubToken string,
 ) {
-	goreleaser := goreleaserContainer(source, githubToken).WithExec([]string{"release", "--clean"})
+	goreleaser := goreleaserContainer(source, githubToken).WithExec([]string{"ls", "-la"}).WithExec([]string{"goreleaser", "release", "--clean"})
 	_, err := goreleaser.Stderr(ctx)
 	if err != nil {
 		log.Printf("Error occured during release: %s", err)
@@ -114,6 +114,7 @@ func (m *HarborCli) PublishImage(
 	cosignPassword string,
 	regUsername string,
 	regPassword string,
+	regAddress string,
 	publishAddress string,
 	tag string,
 ) string {
@@ -144,42 +145,24 @@ func (m *HarborCli) PublishImage(
 		}
 	}
 
-	//  	// Create a builder container for multi-architecture images
-	// multiArchBuilder := dag.Container().
-	// 	From("docker/buildx:latest").
-	// 	WithWorkdir("/workspace")
-	//
-	// // Add binaries for each OS and architecture to the multi-arch image
-	// oses := []string{"linux", "darwin", "windows"}
-	// arches := []string{"amd64", "arm64"}
-	//
-	// for _, goos := range oses {
-	// 	for _, goarch := range arches {
-	// 		binPath := fmt.Sprintf("build/%s/%s/harbor", goos, goarch)
-	// 		multiArchBuilder = multiArchBuilder.WithFile(fmt.Sprintf("/workspace/%s/%s/harbor", goos, goarch), builder.File(binPath))
-	// 	}
-	// }
-
-	// Build the multi-architecture image
-	// multiArchImage := fmt.Sprintf("%s:%s", publishAddress, tag)
-
 	cosign_key := dag.SetSecret("cosign_key", cosignKey)
 	cosign_password := dag.SetSecret("cosign_password", cosignPassword)
 	regpassword := dag.SetSecret("reg_password", regPassword)
 
+  publisher := cli_runtime.WithRegistryAuth(regAddress, regUsername, regpassword)
 	// Push the versioned tag
 	versionedAddress := fmt.Sprintf("%s:%s", publishAddress, tag)
-	addr, err := cli_runtime.Publish(ctx, versionedAddress, dagger.ContainerPublishOpts{PlatformVariants: filteredBuilders})
+	addr, err := publisher.Publish(ctx, versionedAddress, dagger.ContainerPublishOpts{PlatformVariants: filteredBuilders})
 	if err != nil {
 		panic(err)
 	}
-
 	// Push the latest tag
 	latestAddress := fmt.Sprintf("%s:latest", publishAddress)
-	addr, err = cli_runtime.Publish(ctx, latestAddress)
+	addr, err = publisher.Publish(ctx, latestAddress)
 	if err != nil {
 		panic(err)
 	}
+
 	_, err = dag.Cosign().Sign(ctx, cosign_key, cosign_password, []string{addr}, dagger.CosignSignOpts{RegistryUsername: regUsername, RegistryPassword: regpassword})
 	if err != nil {
 		panic(err)

go.mod

@@ -11,8 +11,6 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-	golang.org/x/sync v0.8.0
 )
 
 require (
@@ -42,6 +40,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sahilm/fuzzy v0.1.1 // indirect
@@ -51,15 +50,14 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/sync v0.8.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require (
-	github.com/99designs/gqlgen v0.17.49
-	github.com/Khan/genqlient v0.7.0
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.23.0 // indirect
@@ -74,37 +72,20 @@ require (
 	github.com/go-openapi/validate v0.24.0 // indirect
 	github.com/goharbor/go-client v0.210.0
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/sosodev/duration v1.3.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.16
 	go.mongodb.org/mongo-driver v1.16.0 // indirect
-	go.opentelemetry.io/otel v1.28.0
-	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240726164100-16a4e332762c
-	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
-	go.opentelemetry.io/otel/log v0.4.0
+	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.28.0
-	go.opentelemetry.io/otel/sdk/log v0.4.0
-	go.opentelemetry.io/otel/trace v1.28.0
-	go.opentelemetry.io/proto/otlp v1.3.1
-	golang.org/x/net v0.29.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
-	google.golang.org/grpc v1.65.0
-	google.golang.org/protobuf v1.34.2 // indirect
 )
 
 replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240518090000-14441aefdf88