Fixing check issues

Fixing static check issues, go mod and so on

Author: voyvodov

.github/workflows/ci.yml

@@ -5,13 +5,13 @@ on:
       - master
   pull_request:
     branches:
-      - master
+      - '*'
 jobs:
-  build:
+  check:
     strategy:
       matrix:
         go-version:
-          - 1.20.x
+          - 1.21.x
           - 1.19.x
         os:
           - ubuntu
@@ -24,7 +24,7 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
 
-    - run: make build
+    - run: make check
 
   test:
     strategy:
@@ -37,10 +37,29 @@ jobs:
 
     name: test (${{ matrix.os }}/go-${{ matrix.go-version }})
     runs-on: ${{ matrix.os }}-latest
+    services:
+      minio:
+        image: ${{ (matrix.os == 'ubuntu') && 'bitnami/minio:2023.7.18' || ''}}
+        ports:
+          - 45677:9000
+        options: >-
+          --health-cmd "curl -I http://localhost:9000/minio/health/live -s"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        env:
+          MINIO_ROOT_USER: minioadmin
+          MINIO_ROOT_PASSWORD: minioadmin
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
         go-version: ${{ matrix.go-version }}
+    - uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: temurin
 
     - run: make run-test
+      env:
+        TEST_ENDPOINT_URL: ${{ (matrix.os == 'ubuntu') && 'http://localhost:45677' || '' }}

Makefile

@@ -16,7 +16,7 @@ run-test: s3proxy.jar
 	./test/run-tests.sh
 
 s3proxy.jar:
-	wget https://github.com/gaul/s3proxy/releases/download/s3proxy-1.8.0/s3proxy -O s3proxy.jar
+	wget https://github.com/gaul/s3proxy/releases/download/s3proxy-2.2.0/s3proxy -O s3proxy.jar
 
 get-deps: s3proxy.jar
 	go get -t ./...
@@ -36,11 +36,11 @@ bootstrap: ## Install tooling
 	@go install $$(go list -e -f '{{join .Imports " "}}' ./internal/tools/tools.go)
 
 .PHONY: check
-check: staticcheck unparam semgrep check-fmt check-codegen check-gomod
+check: staticcheck check-fmt check-gomod
 
 .PHONY: staticcheck
 staticcheck:
-	@staticcheck -checks 'all,-ST1000' ./...
+	@staticcheck -checks 'all,-ST1000,-U1000,-ST1020,-ST1001' ./...
 
 .PHONY: unparam
 unparam:
@@ -52,15 +52,11 @@ semgrep: ## Run semgrep
 
 .PHONY: check-fmt
 check-fmt:
-	@if [ $$(go fmt -mod=vendor ./...) ]; then\
+	@if [ $$(go fmt -mod=mod ./...) ]; then\
 		echo "Go code is not formatted";\
 		exit 1;\
 	fi
 
-.PHONY: check-codegen
-check-codegen: gogenerate ## Check generated code is up-to-date
-	@git diff --exit-code --
-
 .PHONY: check-gomod
 check-gomod: ## Check go.mod file
 	@go mod tidy

api/api.go

@@ -144,7 +144,7 @@ func Mount(
 		catfs.Stderr = catfsLog.Writer()
 		err = catfs.Start()
 		if err != nil {
-			err = fmt.Errorf("Failed to start catfs: %v", err)
+			err = fmt.Errorf("failed to start catfs: %v", err)
 
 			// sleep a bit otherwise can't unmount right away
 			time.Sleep(time.Second)

api/common/conf_azure.go

@@ -62,7 +62,7 @@ func (p returnRequestPolicy) Do(ctx context.Context, r pipeline.Request) (pipeli
 	return resp, nil
 }
 
-// hijack the SharedKeyCredentials signing code from azure-storage-blob-go
+// WithAuthorization hijack the SharedKeyCredentials signing code from azure-storage-blob-go
 // https://github.com/Azure/go-autorest/issues/456
 func (config *AZBlobConfig) WithAuthorization() autorest.PrepareDecorator {
 	return func(p autorest.Preparer) autorest.Preparer {
@@ -97,7 +97,7 @@ type ADLv2Config struct {
 
 type AzureAuthorizerConfig struct {
 	Log      *LogHandle
-	TenantId string
+	TenantID string
 }
 
 var azbLog = GetLogger("azblob")
@@ -118,10 +118,10 @@ func tokenToAuthorizer(t *cli.Token) (autorest.Authorizer, error) {
 		return nil, err
 	}
 
-	tenantId := u.Path
+	tenantID := u.Path
 	u.Path = ""
 
-	oauth, err := adal.NewOAuthConfig(u.String(), tenantId)
+	oauth, err := adal.NewOAuthConfig(u.String(), tenantID)
 	if err != nil {
 		return nil, err
 	}
@@ -161,12 +161,12 @@ func msiToAuthorizer(mc auth.MSIConfig) (autorest.Authorizer, error) {
 }
 
 func (c AzureAuthorizerConfig) Authorizer() (autorest.Authorizer, error) {
-	if c.TenantId == "" {
+	if c.TenantID == "" {
 		defaultSubscription, err := azureDefaultSubscription()
 		if err != nil {
 			return nil, err
 		}
-		c.TenantId = defaultSubscription.TenantID
+		c.TenantID = defaultSubscription.TenantID
 	}
 
 	env, err := auth.GetSettingsFromEnvironment()
@@ -194,7 +194,7 @@ func (c AzureAuthorizerConfig) Authorizer() (autorest.Authorizer, error) {
 		env.Values[auth.ActiveDirectoryEndpoint] = env.Environment.ActiveDirectoryEndpoint
 	}
 	adEndpoint := strings.Trim(env.Values[auth.ActiveDirectoryEndpoint], "/") +
-		"/" + c.TenantId
+		"/" + c.TenantID
 	c.Log.Debugf("looking for access token for %v", adEndpoint)
 
 	accessTokensPath, err := cli.AccessTokensPath()
@@ -238,7 +238,7 @@ func azureDefaultSubscription() (*cli.Subscription, error) {
 		}
 	}
 
-	return nil, fmt.Errorf("Unable to find default azure subscription id")
+	return nil, fmt.Errorf("unable to find default azure subscription id")
 }
 
 func azureAccountsClient(account string) (azblob.AccountsClient, error) {
@@ -253,7 +253,7 @@ func azureAccountsClient(account string) (azblob.AccountsClient, error) {
 
 	authorizer, err := AzureAuthorizerConfig{
 		Log:      azbLog,
-		TenantId: defaultSubscription.TenantID,
+		TenantID: defaultSubscription.TenantID,
 	}.Authorizer()
 	if err != nil {
 		return c, err
@@ -274,13 +274,13 @@ func azureFindAccount(client azblob.AccountsClient, account string) (*azblob.End
 			// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/...
 			parts := strings.SplitN(*acc.ID, "/", 6)
 			if len(parts) != 6 {
-				return nil, "", fmt.Errorf("Malformed account id: %v", *acc.ID)
+				return nil, "", fmt.Errorf("malformed account id: %v", *acc.ID)
 			}
 			return acc.PrimaryEndpoints, parts[4], nil
 		}
 	}
 
-	return nil, "", fmt.Errorf("Azure account not found: %v", account)
+	return nil, "", fmt.Errorf("azure account not found: %v", account)
 }
 
 func AzureBlobConfig(endpoint string, location string, storageType string) (config AZBlobConfig, err error) {
@@ -341,7 +341,7 @@ func AzureBlobConfig(endpoint string, location string, storageType string) (conf
 	}
 	// at this point I have to have the account
 	if account == "" {
-		err = fmt.Errorf("Missing account: configure via AZURE_STORAGE_ACCOUNT "+
+		err = fmt.Errorf("missing account: configure via AZURE_STORAGE_ACCOUNT "+
 			"or %v/config", configDir)
 		return
 	}
@@ -355,7 +355,7 @@ func AzureBlobConfig(endpoint string, location string, storageType string) (conf
 			endpoints, resourceGroup, err = azureFindAccount(client, account)
 			if err != nil {
 				if key == "" {
-					err = fmt.Errorf("Missing key: configure via AZURE_STORAGE_KEY "+
+					err = fmt.Errorf("missing key: configure via AZURE_STORAGE_KEY "+
 						"or %v/config", configDir)
 					return
 				}
@@ -372,7 +372,7 @@ func AzureBlobConfig(endpoint string, location string, storageType string) (conf
 				var keysRes azblob.AccountListKeysResult
 				keysRes, err = client.ListKeys(context.TODO(), resourceGroup, account, azblob.Kerb)
 				if err != nil || len(*keysRes.Keys) == 0 {
-					err = fmt.Errorf("Missing key: configure via AZURE_STORAGE_KEY "+
+					err = fmt.Errorf("missing key: configure via AZURE_STORAGE_KEY "+
 						"or %v/config", configDir)
 					return
 				}
@@ -384,8 +384,10 @@ func AzureBlobConfig(endpoint string, location string, storageType string) (conf
 						break
 					}
 				}
-				// if not just take the first one
-				key = *(*keysRes.Keys)[0].Value
+				if key == "" {
+					// if not just take the first one
+					key = *(*keysRes.Keys)[0].Value
+				}
 			}
 		} else {
 			if key == "" {

api/common/conf_s3.go

@@ -32,7 +32,7 @@ type S3Config struct {
 	AccessKey       string
 	SecretKey       string
 	RoleArn         string
-	RoleExternalId  string
+	RoleExternalID  string
 	RoleSessionName string
 	StsEndpoint     string
 
@@ -109,8 +109,8 @@ func (c *S3Config) ToAwsConfig(flags *FlagStorage) (*aws.Config, error) {
 	if c.RoleArn != "" {
 		c.Credentials = stscreds.NewCredentials(stsConfigProvider{c}, c.RoleArn,
 			func(p *stscreds.AssumeRoleProvider) {
-				if c.RoleExternalId != "" {
-					p.ExternalID = &c.RoleExternalId
+				if c.RoleExternalID != "" {
+					p.ExternalID = &c.RoleExternalID
 				}
 				p.RoleSessionName = c.RoleSessionName
 			})

api/common/config.go

@@ -37,8 +37,8 @@ type FlagStorage struct {
 	Cache    []string
 	DirMode  os.FileMode
 	FileMode os.FileMode
-	Uid      uint32
-	Gid      uint32
+	UID      uint32
+	GID      uint32
 
 	// Common Backend Config
 	UseContentType bool

api/common/logger.go

@@ -144,16 +144,18 @@ type RetryHTTPLogger struct {
 	*LogHandle
 }
 
-const DEBUG_TAG = "[DEBUG]"
-const ERR_TAG = "[ERR]"
+const (
+	debugTag = "[DEBUG]"
+	errTag   = "[ERR]"
+)
 
 func (logger RetryHTTPLogger) Printf(format string, args ...interface{}) {
 	// unfortunately logrus.ParseLevel uses "error" instead of "err"
 	// so we have to map this ourselves
-	if strings.HasPrefix(format, DEBUG_TAG) {
-		logger.LogHandle.Debugf(format[len(DEBUG_TAG)+1:], args...)
-	} else if strings.HasPrefix(format, ERR_TAG) {
-		logger.LogHandle.Errorf(format[len(ERR_TAG)+1:], args...)
+	if strings.HasPrefix(format, debugTag) {
+		logger.LogHandle.Debugf(format[len(debugTag)+1:], args...)
+	} else if strings.HasPrefix(format, errTag) {
+		logger.LogHandle.Errorf(format[len(errTag)+1:], args...)
 	} else {
 		logger.LogHandle.Infof(format, args...)
 	}

internal/aws_test.go

@@ -39,7 +39,7 @@ func (s *AwsTest) SetUpSuite(t *C) {
 }
 
 func (s *AwsTest) TestRegionDetection(t *C) {
-	s.s3.bucket = "goofys-eu-west-1.voyvodov.xyz"
+	s.s3.bucket = "goofys-eu-west-1.StatCan.xyz"
 
 	err, isAws := s.s3.detectBucketLocationByHEAD()
 	t.Assert(err, IsNil)