format code

.github/workflows/cli.yml

@@ -28,11 +28,13 @@ jobs:
         working-directory: cli
         run: |
           make go-fmt
+          git diff --exit-code
 
       - name: Vet
         working-directory: cli
         run: |
           make go-vet
+          git diff --exit-code
 
       # TODO(paulfantom): figure-out why golangci-lint action crashes
       #- name: Lint

cli/Makefile

@@ -29,7 +29,7 @@ go-vet:
 		go vet ./...
 
 go-fmt:
-		gofmt -d .
+		gofmt -s -w .
 
 go-lint:
 		golangci-lint run
@@ -43,4 +43,4 @@ uninstall-tobs:
 delete-kind:
 		kind delete cluster --name tobs
 
-all: build start-kind e2e-tests external-db-tests go-vet go-fmt go-lint
+all: build start-kind e2e-tests external-db-tests go-vet go-fmt go-lint

cli/cmd/grafana/port_forward.go

@@ -50,4 +50,4 @@ func PortForwardGrafana(listenPort int) error {
 	}
 
 	return nil
-}
+}

cli/cmd/timescaledb/port_forward.go

@@ -51,4 +51,4 @@ func PortForwardTimescaleDB(listenPort int) error {
 	}
 
 	return nil
-}
+}

cli/cmd/timescaledb/superuser/change_password.go

@@ -65,7 +65,7 @@ func updateDBPwdSecrets(k8sClient k8s.Client, secretKey, user, password string)
 	}
 
 	if tsdb {
-		secretName := root.HelmReleaseName+"-credentials"
+		secretName := root.HelmReleaseName + "-credentials"
 		tsdbSecret, err := k8sClient.KubeGetSecret(root.Namespace, secretName)
 		if err != nil {
 			return fmt.Errorf("could not get secret with name %s: %w", secretName, err)
@@ -79,7 +79,7 @@ func updateDBPwdSecrets(k8sClient k8s.Client, secretKey, user, password string)
 	}
 
 	// Update Grafana DB creds
-	grafanaSecretName := root.HelmReleaseName+"-grafana-db"
+	grafanaSecretName := root.HelmReleaseName + "-grafana-db"
 	grafanaSecret, err := k8sClient.KubeGetSecret(root.Namespace, grafanaSecretName)
 	if err != nil {
 		return fmt.Errorf("could not get secret with name %s: %w", grafanaSecretName, err)
@@ -95,7 +95,7 @@ func updateDBPwdSecrets(k8sClient k8s.Client, secretKey, user, password string)
 	}
 
 	// Update Promscale connection details
-	promscaleSecretName, err :=  pgconn.GetPromscaleSecretName(root.HelmReleaseName, root.Namespace)
+	promscaleSecretName, err := pgconn.GetPromscaleSecretName(root.HelmReleaseName, root.Namespace)
 	if err != nil {
 		return err
 	}
@@ -110,7 +110,7 @@ func updateDBPwdSecrets(k8sClient k8s.Client, secretKey, user, password string)
 			return fmt.Errorf("failed to parse db-uri %v", err)
 		}
 		dbDetails.ConnConfig.Password = password
-		updatedDBURI, err  := pgconn.UpdatePasswordInDBURI(string(bytepass), password)
+		updatedDBURI, err := pgconn.UpdatePasswordInDBURI(string(bytepass), password)
 		if err != nil {
 			return fmt.Errorf("failed to update password in db-uri %v", err)
 		}

cli/pkg/helm/client_impl.go

@@ -589,4 +589,4 @@ func (c *clientImpl) listDeployedReleases(namespace string) ([]*release.Release,
 	listClient := action.NewList(c.actionConfig)
 	listClient.StateMask = action.ListDeployed | action.ListFailed | action.ListPendingInstall | action.ListPendingUpgrade
 	return listClient.Run()
-}
+}

cli/pkg/k8s/client.go

@@ -73,4 +73,4 @@ type Client interface {
 
 	// Apply manifests
 	ApplyManifests(map[string]string) error
-}
+}

cli/pkg/otel/otel-utilities.go

@@ -143,7 +143,7 @@ func (c *OtelCol) ValidateCertManager() error {
 			// namespace this needs to be ignored as otel-operator helm-chart upgrades them
 			// Mote: Resource with name 'opentelemetry-operator-selfsigned-issuer` isn't part of
 			// any namespace so adding a check.
-			if resource.Namespace != "opentelemetry-operator-system"  {
+			if resource.Namespace != "opentelemetry-operator-system" {
 				if resource.Name != "opentelemetry-operator-selfsigned-issuer" {
 					onlyCertMResources = append(onlyCertMResources, resource)
 				}

cli/pkg/pgconn/connection_test.go

@@ -30,8 +30,8 @@ func TestConstructURI(t *testing.T) {
 			want:           "postgres://bob%20has%20spaces%20in%20his%20username:%7B%40nd%20$p3ci%40L%20ch%40R$%201n%20h1$%20p%40$$w0rd%21%5E%27@localhost:5432/bob_has_a_database",
 		},
 		{
-			user:           "$b0b!",
-			password:       "$p3ci@L-ch@R$_1n\nh1$	p@$$w0rd!^'",
+			user: "$b0b!",
+			password: "$p3ci@L-ch@R$_1n\nh1$	p@$$w0rd!^'",
 			host:           "my.host.com",
 			port:           9999,
 			dbname:         "this-is a valid db nAm3 if double quoted",

cli/tests/tobs-cli-tests/portforward_test.go

@@ -32,7 +32,6 @@ func testpf(t testing.TB, timescale, grafana, prometheus, promscale, promlens st
 	// kubectl get pods -A
 	test_utils.ShowAllPods(t)
 
-
 	t.Logf("Running '%v'", "tobs "+strings.Join(cmds, " "))
 	portforward := exec.Command(PATH_TO_TOBS, cmds...)