fix: various fixes

Author: jochumdev

.github/workflows/release.yaml

@@ -0,0 +1,31 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+    - "*" # triggers only if push new tag version, like `0.8.4` or else  
+
+permissions:
+  contents: write
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
+        uses: actions/setup-go@v5
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v6
+        with:
+          distribution: goreleaser
+          version: '~> v2'
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yaml

@@ -0,0 +1,30 @@
+version: 2
+
+archives:
+  - format: binary
+
+before:
+  hooks:
+    # You may remove this if you don't use go modules.
+    - go mod tidy
+    # you may remove this if you don't need go generate
+    - go generate ./...
+
+builds:
+  - main: ./cmd/operator-docker
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+
+checksum:
+  split: true
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"

development.yaml cmd/octoctl/config.godevelopment.yaml renamed to cmd/octoctl/config.go

@@ -1,18 +1,22 @@
+package main
+
+var hardcodedConfig = `
 repos:
   operators:
     docker:
       binary:
         linux_amd64:
-          url: https://github.com/octocompose/operator-docker/releases/download/v0.0.2/operator-docker_0.0.2_linux_amd64
-          sha256Url: https://github.com/octocompose/operator-docker/releases/download/v0.0.2/operator-docker_0.0.2_linux_amd64.sha256
+          url: https://github.com/octocompose/operator-docker/releases/download/v0.0.3/operator-docker_0.0.3_linux_amd64
+          sha256Url: https://github.com/octocompose/operator-docker/releases/download/v0.0.3/operator-docker_0.0.3_linux_amd64.sha256
         linux_arm64:
-          url: https://github.com/octocompose/operator-docker/releases/download/v0.0.2/operator-docker_0.0.2_linux_arm64
-          sha256Url: https://github.com/octocompose/operator-docker/releases/download/v0.0.2/operator-docker_0.0.2_linux_arm64.sha256
+          url: https://github.com/octocompose/operator-docker/releases/download/v0.0.3/operator-docker_0.0.3_linux_arm64
+          sha256Url: https://github.com/octocompose/operator-docker/releases/download/v0.0.3/operator-docker_0.0.3_linux_arm64.sha256
       source:
         # If path is set and existing, repo and ref are ignored.
         path: ../operator-docker
         repo: https://github.com/octocompose/operator-docker.git
         ref: refs/heads/main
         buildCmds:
           - GOOS={{.OS}} GOARCH={{.ARCH}} make build
-        binary: dist/{{.OS}}/{{.ARCH}}/operator-docker
+        binary: dist/{{.OS}}/{{.ARCH}}/operator-docker
+`

cmd/octoctl/main.go

@@ -47,7 +47,19 @@ func createConfig(ctx context.Context, cmd *cli.Command) (context.Context, error
 
 	logger.Debug("Creating configuration", "config", cmd.StringSlice("config"))
 
-	cfg, err := octoconfig.New(logger, cmd.StringSlice("config"))
+	codec, err := codecs.GetMime(codecs.MimeYAML)
+	if err != nil {
+		logger.Error("Error while getting codec", "error", err)
+		return ctx, err
+	}
+
+	hardCodedData := map[string]any{}
+	if err := codec.Unmarshal([]byte(hardcodedConfig), &hardCodedData); err != nil {
+		logger.Error("Error while marshaling configuration", "error", err)
+		return ctx, err
+	}
+
+	cfg, err := octoconfig.New(logger, cmd.StringSlice("config"), hardCodedData)
 	if err != nil {
 		logger.Error("Error while creating configuration", "error", err)
 		return ctx, err
@@ -119,6 +131,11 @@ func runOperator(ctx context.Context, cmd *cli.Command, args []string) error {
 			return fmt.Errorf("while getting cached URL: %w", err)
 		}
 
+		if err := os.Chmod(url.Path, 0o700); err != nil {
+			logger.Error("Error while chmoding cached operator", "error", err)
+			return fmt.Errorf("while chmoding cached operator: %w", err)
+		}
+
 		logger.Debug("Using cached operator", "url", binary.URL, "cached", url.Path)
 		execPath = url.Path
 	}
@@ -149,6 +166,8 @@ func runOperator(ctx context.Context, cmd *cli.Command, args []string) error {
 		return err
 	}
 
+	logger.Debug("Running operator", "path", execPath, "args", args)
+
 	execCmd := exec.CommandContext(ctx, execPath, args...) //nolint:gosec
 	execCmd.Stdin = bytes.NewReader(b)
 	execCmd.Stdout = os.Stdout

pkg/octocache/octocache.go

@@ -88,7 +88,7 @@ func checkSha256Sum(filePath, checksumPath string) error {
 	fileHashStr := hex.EncodeToString(fileHash[:])
 
 	// Compare the hashes
-	if strings.EqualFold(fileHashStr, checksumStr) {
+	if !strings.EqualFold(fileHashStr, checksumStr) {
 		return fmt.Errorf("checksum mismatch: expected %s, got %s", checksumStr, fileHashStr)
 	}
 

pkg/octoconfig/octoconfig.go

@@ -350,15 +350,18 @@ type Config struct {
 
 	KnownURLs map[string]struct{}
 
+	// Hardcoded config
+	HardcodedData map[string]any
+
 	// Merged data.
 	Data map[string]any
 
 	ProjectID string
 }
 
 // New creates a new configuration from the given paths.
-func New(logger log.Logger, paths []string) (*Config, error) {
-	cfg := &Config{logger: logger, Paths: []*urlConfig{}, KnownURLs: map[string]struct{}{}, Repo: &Repo{}}
+func New(logger log.Logger, paths []string, hardcodedData map[string]any) (*Config, error) {
+	cfg := &Config{logger: logger, Paths: []*urlConfig{}, KnownURLs: map[string]struct{}{}, Repo: &Repo{}, HardcodedData: hardcodedData}
 
 	for _, path := range paths {
 		myURL, err := config.NewURL(path)
@@ -390,6 +393,8 @@ func New(logger log.Logger, paths []string) (*Config, error) {
 		cfg.KnownURLs[myURL.String()] = struct{}{}
 	}
 
+	cfg.HardcodedData = hardcodedData
+
 	return cfg, nil
 }
 
@@ -481,6 +486,11 @@ func (c *Config) mergeRepos(ctx context.Context) error {
 		repoFiles = append(repoFiles, slices.Collect(path.FlattenRepo())...)
 	}
 
+	repoFile := &Repo{}
+	if err := config.Parse(nil, "repos", c.Data, repoFile); err == nil {
+		mergo.Merge(c.Repo, repoFile)
+	}
+
 	slices.Reverse(repoFiles)
 
 	for _, repoFile := range repoFiles {
@@ -530,6 +540,11 @@ func (c *Config) merge(_ context.Context) error {
 
 	var mErr *multierror.Error
 
+	// Merge hardcoded data first.
+	if err := config.Merge(&c.Data, c.HardcodedData); err != nil {
+		mErr = multierror.Append(mErr, err)
+	}
+
 	for _, cfg := range configs {
 		// Log that we're merging this config.
 		c.logger.Trace("Merging config", "url", cfg.URL.String())