lint

lint

lint and tests

Author: anna-cross

.golangci.yml

@@ -22,7 +22,8 @@ linters-settings:
   gocyclo:
     min-complexity: 15
   govet:
-    check-shadowing: true
+    enable:
+      - shadow
     settings:
       printf:
         funcs:
@@ -83,7 +84,6 @@ linters:
     - gochecknoinits
     - goconst
     - gocyclo
-    - godot
     - gofmt
     - goimports
     - goprintffuncname

Makefile

@@ -44,7 +44,7 @@ fig:
 # downgrade linter until https://github.com/golangci/golangci-lint/issues/4239 is fixed
 .PHONY: lint
 lint:
-	docker run --rm -v $(CURDIR):/app -w /app golangci/golangci-lint:v1.54.2 golangci-lint run --timeout 5m -v
+	docker run --rm -v $(CURDIR):/app -w /app golangci/golangci-lint:v1.57.2 golangci-lint run --timeout 5m -v
 
 .PHONY: generate
 generate: mockgen-install

cmd/meroxa/global/config.go

@@ -43,7 +43,6 @@ func GetMeroxaTenantUser() string {
 // getEnvVal returns the value of either the first existing key specified in keys, or defaultVal if none were present.
 func getEnvVal(keys []string, defaultVal string) string {
 	for _, key := range keys {
-
 		if Config != nil {
 			// First tries to return the value from the meroxa configuration file
 			if val := Config.GetString(key); val != "" {

cmd/meroxa/global/global.go

@@ -47,8 +47,7 @@ const (
 	UserFeatureFlagsEnv          = "USER_FEATURE_FLAGS"
 	UserInfoUpdatedAtEnv         = "USER_INFO_UPDATED_AT"
 	TenantEmailAddress           = "TENANT_EMAIL_ADDRESS"
-	// TenantPassword               = "TENANT_PASSWORD"
-	TenantURL = "TENANT_URL"
+	TenantURL                    = "TENANT_URL"
 
 	defaultClientTimeout = time.Second * 10
 )

cmd/meroxa/root/apps/apps.go

@@ -87,7 +87,7 @@ type Application struct {
 	State             string   `json:"state"`
 	ApplicationSpec   string   `json:"stream_tech"`
 	Config            string   `json:"config"`
-	PipelineFilenames string   `json:"pipeline_filenames"`
+	PipelineFilenames string   `json:"pipeline_filename"`
 	PipelineEnriched  string   `json:"pipeline_enriched"`
 	PipelineOriginal  string   `json:"pipeline_original"`
 
@@ -166,7 +166,7 @@ func (*Apps) SubCommands() []*cobra.Command {
 	}
 }
 
-func RetrieveApplicationByNameOrID(ctx context.Context, client global.BasicClient, nameOrID, path string) (*Applications, error) {
+func RetrieveApplicationByNameOrID(ctx context.Context, client global.BasicClient, nameOrID string) (*Applications, error) {
 	apps := Applications{}
 	if nameOrID != "" {
 		a := &url.Values{}

cmd/meroxa/root/apps/deploy.go

@@ -190,11 +190,14 @@ func (d *Deploy) Execute(ctx context.Context) error {
 
 	d.path, err = GetPath(d.flags.Path)
 	if err != nil {
-		return err
+		return fmt.Errorf("error getting conduit app path - %s", err)
 	}
 
 	var buf bytes.Buffer
-	d.gzipConduitApp(d.path, &buf)
+	err = d.gzipConduitApp(d.path, &buf)
+	if err != nil {
+		return fmt.Errorf("error zipping conduit app repository - %s", err)
+	}
 
 	dFile := fmt.Sprintf("conduit-%s.tar.gz", uuid.NewString())
 	fileToWrite, err := os.OpenFile(dFile, os.O_CREATE|os.O_RDWR, os.FileMode(0o777)) //nolint:gomnd

cmd/meroxa/root/apps/describe.go

@@ -65,10 +65,7 @@ meroxa apps describe NAME `,
 }
 
 func (d *Describe) Execute(ctx context.Context) error {
-	apps := &Applications{}
-	var err error
-
-	apps, err = RetrieveApplicationByNameOrID(ctx, d.client, d.args.nameOrUUID, d.flags.Path)
+	apps, err := RetrieveApplicationByNameOrID(ctx, d.client, d.args.nameOrUUID)
 	if err != nil {
 		return err
 	}