Skip to content

Commit

Permalink
Update GitHub Actions workflows. (#358)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
pulumi-bot and iwahbe committed Jan 14, 2024
1 parent b97f1f0 commit 1512d8d
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 5 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/upgrade-bridge.yml
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
10 changes: 10 additions & 0 deletions .golangci.yml
Expand Up @@ -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-postgresql) # Custom section: local imports
custom-order: true
5 changes: 5 additions & 0 deletions Makefile
Expand Up @@ -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-postgresql/schema.json` is valid and up to date.
# To create a release ready binary, you should use `make provider`.
Expand Down
3 changes: 2 additions & 1 deletion provider/cmd/pulumi-resource-postgresql/main.go
Expand Up @@ -19,9 +19,10 @@ package main
import (
_ "embed"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"

postgresql "github.com/pulumi/pulumi-postgresql/provider/v3"
"github.com/pulumi/pulumi-postgresql/provider/v3/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
)

//go:embed schema-embed.json
Expand Down
3 changes: 2 additions & 1 deletion provider/cmd/pulumi-tfgen-postgresql/main.go
Expand Up @@ -15,9 +15,10 @@
package main

import (
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"

postgresql "github.com/pulumi/pulumi-postgresql/provider/v3"
"github.com/pulumi/pulumi-postgresql/provider/v3/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
)

func main() {
Expand Down
4 changes: 3 additions & 1 deletion provider/resources.go
Expand Up @@ -20,11 +20,13 @@ import (
"unicode"

"github.com/cyrilgdn/terraform-provider-postgresql/postgresql"
"github.com/pulumi/pulumi-postgresql/provider/v3/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/sdk/v3/go/common/tokens"

"github.com/pulumi/pulumi-postgresql/provider/v3/pkg/version"
)

// all of the token components used below.
Expand Down

0 comments on commit 1512d8d

Please sign in to comment.