Skip to content

Commit

Permalink
Prepare for major version upgrade and generate schema
Browse files Browse the repository at this point in the history
  • Loading branch information
guineveresaenger committed May 18, 2024
1 parent 86ba840 commit c1d539d
Show file tree
Hide file tree
Showing 20 changed files with 425 additions and 651 deletions.
2 changes: 1 addition & 1 deletion .ci-mgmt.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
provider: openstack
major-version: 3
major-version: 4
env:
OS_AUTH_URL: "https://auth.cloud.ovh.net/v3/"
OS_IDENTITY_API_VERSION: 3
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/command-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0
jobs:
command-dispatch-for-testing:
name: command-dispatch-for-testing
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0

jobs:
license_check:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0

jobs:
lint:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0
jobs:
build_sdk:
name: build_sdk
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0
jobs:
build_sdk:
name: build_sdk
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0
jobs:
comment-on-pr:
if: github.event.pull_request.head.repo.full_name != github.repository
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0
jobs:
build_sdk:
name: build_sdk
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/resync-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0
jobs:
resync_build:
name: resync-build
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
TF_APPEND_USER_AGENT: pulumi
TRAVIS_OS_NAME: linux
VERSION_PREFIX: 4.0.0

# This should cancel any previous runs of the same workflow on the same branch which are still running.
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ builds:
- env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache
ignore: []
ldflags:
- -X github.com/pulumi/pulumi-openstack/provider/v3/pkg/version.Version={{.Tag}}
- -X github.com/pulumi/pulumi-openstack/provider/v4/pkg/version.Version={{.Tag}}
main: ./cmd/pulumi-resource-openstack/
changelog:
skip: true
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ builds:
ignore: []
ldflags:
- -X
github.com/pulumi/pulumi-openstack/provider/v3/pkg/version.Version={{.Tag}}
github.com/pulumi/pulumi-openstack/provider/v4/pkg/version.Version={{.Tag}}
main: ./cmd/pulumi-resource-openstack/
changelog:
filters:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
PACK := openstack
ORG := pulumi
PROJECT := github.com/$(ORG)/pulumi-$(PACK)
PROVIDER_PATH := provider/v3
PROVIDER_PATH := provider/v4
VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version
TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
Expand All @@ -14,7 +14,7 @@ PULUMI_CONVERT := 1

# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
# Local & branch builds will just used this fixed default version unless specified
PROVIDER_VERSION ?= 3.0.0-alpha.0+dev
PROVIDER_VERSION ?= 4.0.0-alpha.0+dev
# Use this normalised version everywhere rather than the raw input to ensure consistency.
VERSION_GENERIC = $(shell pulumictl convert-version --language generic --version "$(PROVIDER_VERSION)")

Expand Down
Loading

0 comments on commit c1d539d

Please sign in to comment.