Merge pull request #63 from thalassa-cloud/projects-api

feat(projects): add project commands and update context handling (beta)

Author: thojkooi

.github/workflows/e2e-tests.yaml

@@ -4,6 +4,10 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
 
 env:
   TCLOUD_E2E_ORGANISATION: "o-d5obcgg3fspc73f7vqpg"
@@ -13,6 +17,7 @@ env:
 jobs:
   e2e-tests:
     runs-on: ubuntu-latest
+    environment: e2e-tests
     permissions:
       id-token: write
       contents: read

.github/workflows/prs.yaml

@@ -31,10 +31,26 @@ jobs:
           args: build --clean --snapshot 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  review:
+  lint:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
-      - uses: reviewdog/action-setup@e04ffabe3898a0af8d0fb1af00c188831c4b5893 # v1.3.2
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: golangci-lint
+        uses: reviewdog/action-golangci-lint@v2
         with:
-          reviewdog_version: latest
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          golangci_lint_version: v2.12.2
+          go_version_file: go.mod
+          reporter: ${{ github.event_name == 'pull_request' && 'github-pr-review' || 'github-check' }}
+          filter_mode: added
+          fail_level: error
+          golangci_lint_flags: >-
+            --new-from-rev=${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            ./...
 

.golangci.yml

@@ -0,0 +1,70 @@
+version: "2"
+run:
+  allow-parallel-runners: true
+linters:
+  default: none
+  enable:
+    - copyloopvar
+    - dupl
+    - errcheck
+    - ginkgolinter
+    - goconst
+    - gocyclo
+    - govet
+    - ineffassign
+    - lll
+    - misspell
+    - nakedret
+    - prealloc
+    - revive
+    - staticcheck
+    - unconvert
+    - unparam
+    - unused
+  settings:
+    goconst:
+      # Test fixtures repeat literals intentionally; production-only checks stay useful.
+      ignore-tests: true
+      # K8s condition type names and similar domain strings often repeat only a few times.
+      min-occurrences: 8
+    lll:
+      # Max line length, lines longer will be reported.
+      # '\t' is counted as 1 character by default, and can be changed with the tab-width option.
+      # Default: 120.
+      line-length: 240
+      # Tab width in spaces.
+      # Default: 1
+      tab-width: 1
+    revive:
+      rules:
+        - name: comment-spacings
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - lll
+        path: api/*
+      - linters:
+          - dupl
+          - lll
+        path: internal/*
+      # Reconcile helpers often return (ctrl.Result, error) for a uniform call site while
+      # encoding retries in Result and leaving error nil (controller-runtime does the same).
+      - linters:
+          - unparam
+        text: is always nil
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - api/v1/zz_generated.deepcopy.go
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/api/raw.go

@@ -58,7 +58,7 @@ Requires client-go with RawRequest support.`,
 		if err != nil {
 			return fmt.Errorf("request failed: %w", err)
 		}
-		defer resp.RawResponse.Body.Close()
+		defer func() { _ = resp.RawResponse.Body.Close() }()
 
 		if rawShowHeaders {
 			for k, v := range resp.RawResponse.Header {

cmd/audit/export.go

@@ -147,7 +147,7 @@ func splitTimeRange(start, end time.Time, splitPeriod string) [][]time.Time {
 }
 
 // exportTimeRange exports audit logs for a specific time range
-func exportTimeRange(ctx context.Context, client thalassa.Client, start, end time.Time, filter *audit.AuditLogFilter, chunkIndex int, totalChunks int, outputFile string, writeToStdout bool) ([]audit.AuditLog, error) {
+func exportTimeRange(ctx context.Context, client thalassa.Client, start, end time.Time, filter *audit.AuditLogFilter, chunkIndex int, totalChunks int, writeToStdout bool) ([]audit.AuditLog, error) {
 	if !writeToStdout && totalChunks > 1 {
 		fmt.Printf("Exporting chunk %d/%d: %s to %s...\n", chunkIndex+1, totalChunks, start.Format(time.RFC3339), end.Format(time.RFC3339))
 	}
@@ -198,7 +198,7 @@ func exportTimeRange(ctx context.Context, client thalassa.Client, start, end tim
 }
 
 // writeExport writes the export data to a file
-func writeExport(exportData map[string]interface{}, outputPath string, writeToStdout bool) error {
+func writeExport(exportData map[string]any, outputPath string, writeToStdout bool) error {
 	var file *os.File
 	var err error
 
@@ -217,7 +217,7 @@ func writeExport(exportData map[string]interface{}, outputPath string, writeToSt
 		if err != nil {
 			return fmt.Errorf("failed to create output file: %w", err)
 		}
-		defer file.Close()
+		defer func() { _ = file.Close() }()
 	}
 
 	encoder := json.NewEncoder(file)
@@ -386,7 +386,7 @@ Examples:
 			chunkCtx, cancel := context.WithTimeout(cmd.Context(), timeoutDuration)
 
 			// Fetch logs for this chunk
-			chunkLogs, err := exportTimeRange(chunkCtx, client, chunkStart, chunkEnd, filter, i, len(chunks), outputFile, writeToStdout)
+			chunkLogs, err := exportTimeRange(chunkCtx, client, chunkStart, chunkEnd, filter, i, len(chunks), writeToStdout)
 
 			// Always cancel the context when done with this chunk
 			cancel()
@@ -435,9 +435,9 @@ Examples:
 			}
 
 			// Prepare export data with metadata
-			exportData := map[string]interface{}{
+			exportData := map[string]any{
 				"exportedAt": time.Now().Format(time.RFC3339),
-				"timeRange": map[string]interface{}{
+				"timeRange": map[string]any{
 					"type":  rangeType,
 					"start": chunkStart.Format(time.RFC3339),
 					"end":   chunkEnd.Format(time.RFC3339),
@@ -447,26 +447,26 @@ Examples:
 			}
 
 			if len(chunks) > 1 {
-				exportData["chunk"] = map[string]interface{}{
+				exportData["chunk"] = map[string]any{
 					"index": i + 1,
 					"total": len(chunks),
 				}
 			}
 
 			// Add custom range dates if applicable
 			if rangeType == "custom" {
-				exportData["timeRange"].(map[string]interface{})["startDate"] = startDate
-				exportData["timeRange"].(map[string]interface{})["endDate"] = endDate
+				exportData["timeRange"].(map[string]any)["startDate"] = startDate
+				exportData["timeRange"].(map[string]any)["endDate"] = endDate
 			}
 
 			// Add duration if using --since
 			if rangeType == "duration" {
-				exportData["timeRange"].(map[string]interface{})["since"] = sinceDuration
+				exportData["timeRange"].(map[string]any)["since"] = sinceDuration
 			}
 
 			// Add filter metadata if filters were applied
 			if hasFilters {
-				filterMetadata := map[string]interface{}{}
+				filterMetadata := map[string]any{}
 				if searchText != "" {
 					filterMetadata["searchText"] = searchText
 				}

cmd/cmd.go

@@ -19,6 +19,7 @@ import (
 	"github.com/thalassa-cloud/cli/cmd/me"
 	"github.com/thalassa-cloud/cli/cmd/objectstorage"
 	"github.com/thalassa-cloud/cli/cmd/oidc"
+	"github.com/thalassa-cloud/cli/cmd/projects"
 	"github.com/thalassa-cloud/cli/cmd/quotas"
 	"github.com/thalassa-cloud/cli/cmd/registry"
 	"github.com/thalassa-cloud/cli/cmd/version"
@@ -47,6 +48,7 @@ func handleExecutionError(err error) {
 
 func init() {
 	RootCmd.PersistentFlags().StringVarP(&contextstate.OrganisationFlag, "organisation", "O", "", "Organisation slug or identity (overrides context)")
+	RootCmd.PersistentFlags().StringVarP(&contextstate.ProjectFlag, "project", "P", "", "Project identity (overrides context; slug is resolved to identity; use \"root\" for organisation scope)")
 	RootCmd.PersistentFlags().StringVarP(&contextstate.ContextFlag, "context", "c", "", "Context name")
 	RootCmd.PersistentFlags().StringVar(&contextstate.EndpointFlag, "api", "", "API endpoint (overrides context)")
 	RootCmd.PersistentFlags().StringVar(&contextstate.AccessTokenFlag, "access-token", "", "Access Token authentication (overrides context)")
@@ -56,7 +58,8 @@ func init() {
 	RootCmd.PersistentFlags().BoolVar(&contextstate.DebugFlag, "debug", false, "Debug mode")
 
 	// Register completions
-	RootCmd.RegisterFlagCompletionFunc("organisation", completion.CompleteOrganisation)
+	_ = RootCmd.RegisterFlagCompletionFunc("organisation", completion.CompleteOrganisation)
+	_ = RootCmd.RegisterFlagCompletionFunc("project", completion.CompleteProject)
 
 	RootCmd.AddCommand(api.ApiCmd)
 	RootCmd.AddCommand(context.ContextCmd)
@@ -73,6 +76,7 @@ func init() {
 	RootCmd.AddCommand(dbaas.DbaasCmd)
 	RootCmd.AddCommand(me.MeCmd)
 	RootCmd.AddCommand(iam.IamCmd)
+	RootCmd.AddCommand(projects.ProjectsCmd)
 	RootCmd.AddCommand(audit.AuditCmd)
 	RootCmd.AddCommand(registry.RegistryCmd)
 	RootCmd.AddCommand(oidc.OidcCmd)

cmd/context/context.go

@@ -8,7 +8,7 @@ import (
 var ContextCmd = &cobra.Command{
 	Use:   "context",
 	Short: "Manage context",
-	Long:  "Manage context for the CLI. Contexts are used to manage multiple organisations and APIs.",
+	Long:  "Manage context for the CLI. Contexts are used to manage multiple organisations, projects, and APIs.",
 }
 
 func init() {

cmd/context/create.go

@@ -111,7 +111,7 @@ func createNewContext() error {
 		return err
 	}
 
-	defaultContext := newDefaultContext(contextName, contextstate.OrganisationFlag, u.Host)
+	defaultContext := newDefaultContext(contextName, contextstate.OrganisationFlag, contextstate.ProjectFlag, u.Host)
 	err = contextstate.GlobalConfigManager().AddOrMergeContext(defaultContext)
 	if err != nil {
 		return err
@@ -130,10 +130,11 @@ func init() {
 	createCmd.Flags().StringVar(&contextName, "name", "default", "name of the context")
 }
 
-func newDefaultContext(contextName, organisation, apiName string) contextstate.Context {
+func newDefaultContext(contextName, organisation, project, apiName string) contextstate.Context {
 	return contextstate.Context{
 		Name:         contextName,
 		Organisation: organisation,
+		Project:      project,
 		Servers: contextstate.Servers{
 			Name: apiName,
 			API: contextstate.API{

cmd/context/list.go

@@ -38,13 +38,13 @@ var listContextCmd = &cobra.Command{
 			if showCurrent && name == currentContextName {
 				name = fmt.Sprintf("* %s", name)
 			}
-			body = append(body, []string{name, c.Context.Organisation, c.Context.User, c.Context.API})
+			body = append(body, []string{name, c.Context.Organisation, c.Context.Project, c.Context.User, c.Context.API})
 		}
 
 		if noHeader {
 			table.Print(nil, body)
 		} else {
-			table.Print([]string{"Name", "Organisation", "User", "Endpoint"}, body)
+			table.Print([]string{"Name", "Organisation", "Project", "User", "Endpoint"}, body)
 		}
 		return nil
 	},

cmd/context/login.go

@@ -2,13 +2,11 @@ package context
 
 import (
 	"errors"
-	"fmt"
 	"strings"
 
 	"github.com/spf13/cobra"
 
 	"github.com/thalassa-cloud/cli/internal/config/contextstate"
-	"github.com/thalassa-cloud/client-go/pkg/client"
 )
 
 // createCmd represents the create command
@@ -29,24 +27,6 @@ var loginCmd = &cobra.Command{
 		oidcClientID := contextstate.ClientIdOrFlag()
 		oidcClientSecret := contextstate.ClientSecretOrFlag()
 
-		tokenURL := fmt.Sprintf("%s/oidc/token", apiURL)
-
-		opts := []client.Option{}
-		if oidcClientID != "" && oidcClientSecret != "" {
-			opts = append(opts, client.WithAuthOIDC(oidcClientID, oidcClientSecret, tokenURL))
-		} else if accessToken != "" {
-			opts = append(opts, client.WithToken(accessToken))
-		} else if token != "" {
-			opts = append(opts, client.WithAuthPersonalToken(token))
-		}
-		if len(opts) == 0 {
-			return errors.New("no authentication method provided")
-		}
-		opts = append(opts, client.WithBaseURL(apiURL))
-		if contextstate.Organisation() != "" {
-			opts = append(opts, client.WithOrganisation(contextstate.Organisation()))
-		}
-
 		if oidcClientID != "" && oidcClientSecret != "" {
 			return contextstate.LoginWithAPIEndpointOidc(cmd.Context(), oidcClientID, oidcClientSecret, apiURL)
 		}
@@ -56,6 +36,9 @@ var loginCmd = &cobra.Command{
 			}
 			return contextstate.LoginWithAccessToken(cmd.Context(), accessToken, apiURL)
 		}
+		if token == "" {
+			return errors.New("no authentication method provided")
+		}
 		return contextstate.LoginWithAPIEndpoint(cmd.Context(), token, apiURL)
 	},
 }