style: applying gci and fmt rules

indykite · Sep 8, 2022 · a55ec1a · a55ec1a
1 parent fb38194
commit a55ec1a
Show file tree

Hide file tree

Showing 71 changed files with 346 additions and 289 deletions.
diff --git a/.github/workflows/go-lint-check.yaml b/.github/workflows/go-lint-check.yaml
@@ -22,7 +22,7 @@ jobs:
               uses: golangci/golangci-lint-action@v3
               with:
                   # Required: the version of golangci-lint is required and must be specified without patch version.
-                  version: v1.46
+                  version: v1.49
 
                   # Optional: working directory, useful for monorepos
                   # working-directory: ./...

diff --git a/.github/workflows/pr-test.yaml b/.github/workflows/pr-test.yaml
@@ -10,6 +10,10 @@ on:
         paths-ignore:
             - version.txt
             - CHANGELOG.md
+    push:
+        branches:
+            - master
+
 concurrency:
     group: pr-${{ github.ref }}
     cancel-in-progress: true

diff --git a/.golangci.yml b/.golangci.yml
@@ -3,7 +3,7 @@ linters:
     enable:
         - deadcode
         - errcheck
-        - goimports
+        - gci
         - gosec
         - gosimple
         - govet
@@ -31,8 +31,14 @@ linters-settings:
     lll:
         line-length: 120
         tab-width: 4
-    goimports:
-        local-prefixes: github.com/indykite/identity-sdk-go
+    gci:
+        # Keep in sync with GNUMakefile
+        sections:
+            - standard
+            - default
+            - prefix(github.com/indykite/jarvis-sdk-go)
+            - blank
+            - dot
     staticcheck:
         go: '1.16'
         checks: [all, -ST1000]

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -73,9 +73,9 @@ repos:
             language: system
             pass_filenames: false
 
-          - id: go_imports
+          - id: fmt_gci
             name: Fix imports and Format go code
-            entry: make goimports
+            entry: make fmt gci
             language: system
             pass_filenames: false
 

diff --git a/GNUmakefile b/GNUmakefile
@@ -1,9 +1,16 @@
-GO111MODULE=on
+.PHONY: test
+
 default:
 
-goimports:
-	@echo "==> Fixing imports code with goimports in Jarvis..."
-	@goimports -local "github.com/indykite/jarvis-sdk-go" -w .
+fmt:
+	@echo "==> Fixing source code with gofmt..."
+	gofmt -s -w .
+
+goimports: gci
+
+gci:
+	@echo "==> Fixing imports code with gci..."
+	gci write -s standard -s default -s "prefix(github.com/indykite/jarvis-sdk-go)" -s blank -s dot .
 
 lint:
 	@echo "==> Checking source code against linters..."
@@ -15,9 +22,8 @@ download:
 
 install-tools: download
 	@echo Installing tools from tools.go
-	@go list -f '{{range .Imports}}{{.}} {{end}}' tools.go | xargs go install
+	@go install $$(go list -f '{{range .Imports}}{{.}} {{end}}' tools.go)
 
-.PHONY: test
 test:
 	go test -v -cpu 4 -covermode=count -coverpkg github.com/indykite/jarvis-sdk-go/... -coverprofile=coverage.out.tmp ./...
 	cat coverage.out.tmp | grep -v "pb.go\|pb.validate.go\|generated.go\|jarvis-sdk-go/test/\|main.go\|jarvis-sdk-go/examples/" > coverage.out
@@ -30,4 +36,4 @@ cover: test
 generate-proto:
 	@buf generate buf.build/indykite/indykiteapis
 	@go generate
-	@make goimports
+	@make fmt gci
diff --git a/config/application.go b/config/application.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) CreateApplication(

diff --git a/config/application_agent.go b/config/application_agent.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) ReadApplicationAgent(

diff --git a/config/application_agent_credentials.go b/config/application_agent_credentials.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) RegisterApplicationAgentCredential(

diff --git a/config/application_space.go b/config/application_space.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) CreateApplicationSpace(

diff --git a/config/config_client.go b/config/config_client.go
@@ -40,8 +40,6 @@ type Client struct {
 // NewClient creates a new Config Management gRPC Client.
 //
 // IndyKite Configuration API
-//
-//
 func NewClient(ctx context.Context, opts ...api.ClientOption) (*Client, error) {
 	clientOpts := defaultClientOptions()
 	connPool, _, err := api.DialPool(ctx, append(clientOpts, opts...)...)
@@ -59,8 +57,6 @@ func NewClient(ctx context.Context, opts ...api.ClientOption) (*Client, error) {
 // NewTestClient creates a new Config Management gRPC Client for Testing.
 //
 // IndyKite Configuration API
-//
-//
 func NewTestClient(_ context.Context, client configpb.ConfigManagementAPIClient) (*Client, error) {
 	c := &Client{
 		xMetadata:    metadata.Pairs("x-jarvis-client", fmt.Sprintf("client/%s grpc/%s", versionClient, grpc.Version)),

diff --git a/config/config_node.go b/config/config_node.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) CreateConfigNode(ctx context.Context, request *NodeRequest, opts ...grpc.CallOption) (

diff --git a/config/customer.go b/config/customer.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) ReadCustomer(

diff --git a/config/doc.go b/config/doc.go
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-/*
-Package config implement the Configuration Management Client.
-*/
+// Package config implement the Configuration Management Client.
 package config
 
 const versionClient = "v1.0.0" // x-release-please-version
diff --git a/config/example_test.go b/config/example_test.go
@@ -22,10 +22,9 @@ import (
 
 	"google.golang.org/protobuf/encoding/protojson"
 
+	"github.com/indykite/jarvis-sdk-go/config"
 	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 	api "github.com/indykite/jarvis-sdk-go/grpc"
-
-	"github.com/indykite/jarvis-sdk-go/config"
 )
 
 // This example demonstrates how to create a new Config Client.

diff --git a/config/mapping_builder_test.go b/config/mapping_builder_test.go
@@ -17,13 +17,12 @@
 package config_test
 
 import (
+	"github.com/indykite/jarvis-sdk-go/config"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
-
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
-	"github.com/indykite/jarvis-sdk-go/config"
 )
 
 var _ = Describe("Mapping builder", func() {

diff --git a/config/oauth2_application.go b/config/oauth2_application.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) ReadOAuth2Application(

diff --git a/config/oauth2_provider.go b/config/oauth2_provider.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) ReadOAuth2Provider(

diff --git a/config/tenant.go b/config/tenant.go
@@ -19,9 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/errors"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 func (c *Client) CreateTenant(

diff --git a/doc.go b/doc.go
@@ -20,11 +20,9 @@
 /*
 Package indykite is the root of the packages used to access IndyKite Platform.
 
-
 Debugging
 To see gRPC logs, set the environment variable GRPC_GO_LOG_SEVERITY_LEVEL. See
 https://pkg.go.dev/google.golang.org/grpc/grpclog for more information.
 For HTTP logging, set the GODEBUG environment variable to "http2debug=1" or "http2debug=2".
-
 */
 package indykite
diff --git a/examples/config/cmd/ingest_mapping.go b/examples/config/cmd/ingest_mapping.go
@@ -21,9 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/config"
+	configpb "github.com/indykite/jarvis-sdk-go/gen/indykite/config/v1beta1"
 )
 
 var ingestMappingCmd = &cobra.Command{

diff --git a/examples/config/cmd/root.go b/examples/config/cmd/root.go
@@ -28,10 +28,9 @@ import (
 	"golang.org/x/oauth2"
 	"google.golang.org/protobuf/encoding/protojson"
 
+	"github.com/indykite/jarvis-sdk-go/config"
 	"github.com/indykite/jarvis-sdk-go/grpc"
 	apicfg "github.com/indykite/jarvis-sdk-go/grpc/config"
-
-	"github.com/indykite/jarvis-sdk-go/config"
 )
 
 var (

diff --git a/examples/identity/cmd/change_password.go b/examples/identity/cmd/change_password.go
@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/identity"
 )
 

diff --git a/examples/identity/cmd/delete_digital_twin.go b/examples/identity/cmd/delete_digital_twin.go
@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/identity"
 )
 

diff --git a/examples/identity/cmd/enrich_token.go b/examples/identity/cmd/enrich_token.go
@@ -19,10 +19,9 @@ import (
 	"fmt"
 	"log"
 
-	"google.golang.org/protobuf/types/known/structpb"
-
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
 	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/types/known/structpb"
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
 )

diff --git a/examples/identity/cmd/get_digital_twin.go b/examples/identity/cmd/get_digital_twin.go
@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/identity"
 )
 

diff --git a/examples/identity/cmd/is_authorized.go b/examples/identity/cmd/is_authorized.go
@@ -19,12 +19,11 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/indykite/jarvis-sdk-go/identity"
-
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
 	"github.com/spf13/cobra"
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
+	"github.com/indykite/jarvis-sdk-go/identity"
 )
 
 var isAuthorizedCmd = &cobra.Command{

diff --git a/examples/identity/cmd/patch_properties.go b/examples/identity/cmd/patch_properties.go
@@ -24,7 +24,6 @@ import (
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
 	objects "github.com/indykite/jarvis-sdk-go/gen/indykite/objects/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/identity"
 )
 

diff --git a/examples/identity/cmd/root.go b/examples/identity/cmd/root.go
@@ -27,10 +27,8 @@ import (
 	"github.com/spf13/viper"
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/indykite/jarvis-sdk-go/grpc/config"
-
 	"github.com/indykite/jarvis-sdk-go/grpc"
-
+	"github.com/indykite/jarvis-sdk-go/grpc/config"
 	"github.com/indykite/jarvis-sdk-go/identity"
 )
 

diff --git a/examples/identity/cmd/verify_email.go b/examples/identity/cmd/verify_email.go
@@ -24,7 +24,6 @@ import (
 
 	identitypb "github.com/indykite/jarvis-sdk-go/gen/indykite/identity/v1beta1"
 	objects "github.com/indykite/jarvis-sdk-go/gen/indykite/objects/v1beta1"
-
 	"github.com/indykite/jarvis-sdk-go/identity"
 )
 

diff --git a/examples/ingest/cmd/root.go b/examples/ingest/cmd/root.go
@@ -30,7 +30,6 @@ import (
 
 	"github.com/indykite/jarvis-sdk-go/grpc"
 	apicfg "github.com/indykite/jarvis-sdk-go/grpc/config"
-
 	"github.com/indykite/jarvis-sdk-go/ingest"
 )
 

diff --git a/examples/ingest/cmd/stream.go b/examples/ingest/cmd/stream.go
@@ -18,11 +18,10 @@ import (
 	"fmt"
 	"log"
 
-	ingestpb "github.com/indykite/jarvis-sdk-go/gen/indykite/ingest/v1beta1"
+	"github.com/spf13/cobra"
 
+	ingestpb "github.com/indykite/jarvis-sdk-go/gen/indykite/ingest/v1beta1"
 	objects "github.com/indykite/jarvis-sdk-go/gen/indykite/objects/v1beta1"
-
-	"github.com/spf13/cobra"
 )
 
 // streamCmd represents the upload command