Update GitHub Actions workflows. (#943)

This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 4372b1f696203493bd59ca973e67a90cfc24460a. --------- Co-authored-by: Ian Wahbe <[email protected]>
pulumi · Jan 14, 2024 · b15ffd4 · b15ffd4
1 parent 5c1ded4
commit b15ffd4
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 21 deletions.
diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml
@@ -7,6 +7,11 @@ on:
       - upgrade-bridge
   workflow_dispatch:
     inputs:
+      kind:
+        description: Overrides the kind of upgrade. Must be one of `all`, `bridge`, `provider`, `code`, `pf`, or `pulumi`.
+        required: false
+        type: string
+        default: "bridge"
       target-bridge-version:
         description: pulumi-terraform-bridge version or hash reference
         required: false
@@ -50,7 +55,7 @@ jobs:
       if: github.event_name == 'workflow_dispatch'
       uses: pulumi/[email protected]
       with:
-        kind: bridge
+        kind: ${{ inputs.kind }}
         email: [email protected]
         username: pulumi-bot
         automerge: ${{ inputs.automerge }}
@@ -62,7 +67,7 @@ jobs:
       if: github.event_name == 'repository_dispatch'
       uses: pulumi/[email protected]
       with:
-        kind: bridge
+        kind: ${{ inputs.kind }}
         email: [email protected]
         username: pulumi-bot
         automerge: ${{ github.event.client_payload.automerge }}

diff --git a/.golangci.yml b/.golangci.yml
@@ -18,9 +18,19 @@ linters:
   - structcheck
   - unconvert
   - varcheck
+  - gci
   enable-all: false
 run:
   skip-files:
   - schema.go
   - pulumiManifest.go
   timeout: 20m
+linters-settings:
+  gci:
+    sections:
+      - standard # Standard section: captures all standard library packages.
+      - blank # Blank section: contains all blank imports.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - prefix(github.com/pulumi/) # Custom section: groups all imports with the github.com/pulumi/ prefix.
+      - prefix(github.com/pulumi/pulumi-docker) # Custom section: local imports
+    custom-order: true
diff --git a/Makefile b/Makefile
@@ -102,6 +102,11 @@ install_plugins: .pulumi/bin/pulumi
 lint_provider: provider
 	cd provider && golangci-lint run -c ../.golangci.yml
 
+# `lint_provider.fix` is a utility target meant to be run manually
+# that will run the linter and fix errors when possible.
+lint_provider.fix:
+	cd provider && golangci-lint run -c ../.golangci.yml --fix
+
 # `make provider_no_deps` builds the provider binary directly, without ensuring that 
 # `cmd/pulumi-resource-docker/schema.json` is valid and up to date. 
 # To create a release ready binary, you should use `make provider`.

diff --git a/provider/cmd/pulumi-resource-docker/main.go b/provider/cmd/pulumi-resource-docker/main.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	_ "embed"
+
 	"github.com/pulumi/pulumi-docker/provider/v4"
 	"github.com/pulumi/pulumi-docker/provider/v4/pkg/version"
 )

diff --git a/provider/cmd/pulumi-tfgen-docker/main.go b/provider/cmd/pulumi-tfgen-docker/main.go
@@ -15,9 +15,10 @@
 package main
 
 import (
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
+
 	docker "github.com/pulumi/pulumi-docker/provider/v4"
 	"github.com/pulumi/pulumi-docker/provider/v4/pkg/version"
-	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
 )
 
 func main() {

diff --git a/provider/hybrid.go b/provider/hybrid.go
@@ -5,13 +5,14 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/ptypes/empty"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
+
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
 	rpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 // Hybrid provider struct

diff --git a/provider/image.go b/provider/image.go
@@ -39,9 +39,10 @@ import (
 	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/moby/moby/registry"
 	"github.com/opencontainers/go-digest"
+	"github.com/spf13/afero"
+
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
-	"github.com/spf13/afero"
 )
 
 const (

diff --git a/provider/image_test.go b/provider/image_test.go
@@ -8,10 +8,11 @@ import (
 	"testing"
 
 	"github.com/docker/docker/api/types"
-	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 )
 
 func TestSetRegistry(t *testing.T) {

diff --git a/provider/provider.go b/provider/provider.go
@@ -18,17 +18,18 @@ import (
 	pbempty "github.com/golang/protobuf/ptypes/empty"
 	"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
 	"github.com/pkg/errors"
+	"github.com/spf13/afero"
+	"github.com/tonistiigi/fsutil"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/emptypb"
+
 	"github.com/pulumi/pulumi/pkg/v3/resource/provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/diag"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/logging"
 	rpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
-	"github.com/spf13/afero"
-	"github.com/tonistiigi/fsutil"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/emptypb"
 )
 
 type dockerNativeProvider struct {

diff --git a/provider/provider_test.go b/provider/provider_test.go
@@ -7,11 +7,12 @@ import (
 	"testing"
 
 	"github.com/docker/distribution/reference"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/resource/plugin"
 	rpc "github.com/pulumi/pulumi/sdk/v3/proto/go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestDiffUpdates(t *testing.T) {

diff --git a/provider/resources.go b/provider/resources.go
@@ -15,21 +15,23 @@
 package provider
 
 import (
-	// embed is used to store bridge-metadata.json in the compiled binary
-	_ "embed"
 	"fmt"
 	"path/filepath"
 	"unicode"
 
-	"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
-	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	// embed is used to store bridge-metadata.json in the compiled binary
+	_ "embed"
+
+	"github.com/terraform-providers/terraform-provider-docker/shim"
 
-	"github.com/pulumi/pulumi-docker/provider/v4/pkg/version"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	tfbridgetokens "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"
 	shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
+	"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
-	"github.com/terraform-providers/terraform-provider-docker/shim"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+
+	"github.com/pulumi/pulumi-docker/provider/v4/pkg/version"
 )
 
 const (

diff --git a/provider/serve.go b/provider/serve.go
@@ -2,6 +2,7 @@ package provider
 
 import (
 	"context"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
 	"github.com/pulumi/pulumi/pkg/v3/resource/provider"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/cmdutil"