Update GitHub Actions workflows. (#399)

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 <ian@wahbe.com>

.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/pulumi-upgrade-provider-action@v0.0.11
  with:
- kind: bridge
+ kind: ${{ inputs.kind }}
  email: bot@pulumi.com
  username: pulumi-bot
  automerge: ${{ inputs.automerge }}
@@ -62,7 +67,7 @@ jobs:
  if: github.event_name == 'repository_dispatch'
  uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
  with:
- kind: bridge
+ kind: ${{ inputs.kind }}
  email: bot@pulumi.com
  username: pulumi-bot
  automerge: ${{ github.event.client_payload.automerge }}

.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-vsphere) # Custom section: local imports
+ custom-order: true

Makefile

@@ -98,6 +98,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-vsphere/schema.json` is valid and up to date. 
 # To create a release ready binary, you should use `make provider`.

provider/cmd/pulumi-resource-vsphere/main.go

@@ -20,6 +20,7 @@ import (
  _ "embed"
 
  "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
+
  vsphere "github.com/pulumi/pulumi-vsphere/provider/v4"
  "github.com/pulumi/pulumi-vsphere/provider/v4/pkg/version"
 )

provider/cmd/pulumi-tfgen-vsphere/main.go

@@ -16,6 +16,7 @@ package main
 
 import (
  "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
+
  vsphere "github.com/pulumi/pulumi-vsphere/provider/v4"
  "github.com/pulumi/pulumi-vsphere/provider/v4/pkg/version"
 )

provider/resources.go

@@ -6,12 +6,14 @@ import (
  "unicode"
 
  "github.com/hashicorp/terraform-provider-vsphere/vsphere"
+
  "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-vsphere/provider/v4/pkg/version"
  "github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
  "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
+
+ "github.com/pulumi/pulumi-vsphere/provider/v4/pkg/version"
 )
 
 const (