From f6708a43dad52fe34d1220c766cdde4eaab8727c Mon Sep 17 00:00:00 2001 From: TP Honey Date: Thu, 1 Aug 2024 14:03:26 +0100 Subject: [PATCH] (maint) use a centralized .golangci.yml --- .github/workflows/tests.yml | 5 +++++ .golangci.yml | 3 --- cmd/auth_client.go | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 .golangci.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fb14f092..0dc197a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,6 +38,11 @@ jobs: - name: Go Init uses: ./.github/actions/go_init + # get .golangci.yml from github.com/overmindtech/golangci-lint_config + - name: Get .golangci.yml from github.com/overmindtech/golangci-lint_configs + run: | + curl -sfL https://raw.githubusercontent.com/overmindtech/golangci-lint_config/main/.golangci.yml -o .golangci.yml + - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/.golangci.yml b/.golangci.yml deleted file mode 100644 index fa040781..00000000 --- a/.golangci.yml +++ /dev/null @@ -1,3 +0,0 @@ -linters: - presets: - - bugs diff --git a/cmd/auth_client.go b/cmd/auth_client.go index a4a2ba1a..8aee6e50 100644 --- a/cmd/auth_client.go +++ b/cmd/auth_client.go @@ -34,7 +34,7 @@ func AuthenticatedBookmarkClient(ctx context.Context, oi OvermindInstance) sdpco return sdpconnect.NewBookmarksServiceClient(httpClient, oi.ApiUrl.String()) } -// AuthenticatedChangesClient Returns a bookmark client that uses the auth +// AuthenticatedChangesClient Returns a changes client that uses the auth // embedded in the context and otel instrumentation func AuthenticatedChangesClient(ctx context.Context, oi OvermindInstance) sdpconnect.ChangesServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) @@ -42,7 +42,7 @@ func AuthenticatedChangesClient(ctx context.Context, oi OvermindInstance) sdpcon return sdpconnect.NewChangesServiceClient(httpClient, oi.ApiUrl.String()) } -// AuthenticatedConfigurationClient Returns a bookmark client that uses the auth +// AuthenticatedConfigurationClient Returns a config client that uses the auth // embedded in the context and otel instrumentation func AuthenticatedConfigurationClient(ctx context.Context, oi OvermindInstance) sdpconnect.ConfigurationServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient) @@ -50,7 +50,7 @@ func AuthenticatedConfigurationClient(ctx context.Context, oi OvermindInstance) return sdpconnect.NewConfigurationServiceClient(httpClient, oi.ApiUrl.String()) } -// AuthenticatedManagementClient Returns a bookmark client that uses the auth +// AuthenticatedManagementClient Returns a management client that uses the auth // embedded in the context and otel instrumentation func AuthenticatedManagementClient(ctx context.Context, oi OvermindInstance) sdpconnect.ManagementServiceClient { httpClient := NewAuthenticatedClient(ctx, otelhttp.DefaultClient)