Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider to v1.3.0 #30

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ENV PATH=$PATH:/usr/local/go/bin

# Install go linter
RUN mkdir -p $GOPATH/bin && \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOPATH/bin v1.46.2
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOPATH/bin v1.59.1

ENV PATH=$PATH:$GOPATH/bin

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
prerequisites:
permissions:
pull-requests: write
uses: pulumiverse/infra/.github/workflows/provider-prerequisites.yaml@actions-workflows-v0.0.4
uses: scoretechnologies/infra/.github/workflows/provider-prerequisites.yaml@actions-workflows-v0.0.4
with:
provider: zitadel
goversion: 1.21.x
build:
needs: prerequisites
uses: pulumiverse/infra/.github/workflows/provider-build-sdk.yaml@actions-workflows-v0.0.4
uses: scoretechnologies/infra/.github/workflows/provider-build-sdk.yaml@actions-workflows-v0.0.4
with:
provider: zitadel
goversion: 1.21.x
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
# NPM REGISTRY THEN ENSURE THE NPM_REGISTRY_URL IS CHANGED
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
NUGET_FEED_URL: https://api.nuget.org/v3/index.json
PUBLISH_NUGET: true
PUBLISH_NUGET: false
# IF YOU NEED TO PUBLISH A PYPI PACKAGE THEN ENSURE AN PYPI_PASSWORD
# SECRET IS SET AND PUBLISH_PYPI: TRUE. IF YOU WANT TO PUBLISH TO AN ALTERNATIVE
# PYPI REGISTRY THEN ENSURE THE PYPI_REPOSITORY_URL IS SET. IF YOU ARE USING AN API_TOKEN THEN
Expand All @@ -26,7 +26,7 @@ env:
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
PYPI_USERNAME: "__token__"
PYPI_REPOSITORY_URL: ""
PUBLISH_PYPI: true
PUBLISH_PYPI: false
jobs:
publish_binary:
name: publish
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v4
with:
args: -p 3 release --rm-dist
args: -p 3 release --clean
version: latest
strategy:
fail-fast: true
Expand Down Expand Up @@ -92,6 +92,11 @@ jobs:
with:
node-version: ${{matrix.nodeversion}}
registry-url: ${{env.NPM_REGISTRY_URL}}
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
run_install: false
version: latest
- name: Setup DotNet
uses: actions/setup-dotnet@v1
with:
Expand Down Expand Up @@ -138,8 +143,8 @@ jobs:
- 1.21.x
language:
- nodejs
- python
- dotnet
# - python
# - dotnet
- go
nodeversion:
- 20.x
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-provider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
# TODO: Switch to shared CI like here
# https://github.com/pulumiverse/pulumi-vercel/blob/main/.github/workflows/upgrade-provider.yml
# https://github.com/scoretechnologies/pulumi-vercel/blob/main/.github/workflows/upgrade-provider.yml
# after this issue is fixed
# https://github.com/pulumi/upgrade-provider/issues/179
# or when have time to fix failing go mod tidy in "all" mode.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ provider/**/schema-embed.json
**/version.txt
**/nuget
**/dist
pnpm-lock.yaml
24 changes: 17 additions & 7 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
linters:
enable:
- deadcode
- unused
- errcheck
- goconst
- gofmt
- golint
- revive
- gosec
- govet
- ineffassign
- interfacer
- lll
- megacheck
- misspell
- nakedret
- structcheck

- unconvert
- varcheck

enable-all: false
run:
skip-files:
issues:
exclude-files:
- schema.go
- pulumiManifest.go
run:

timeout: 20m
linters-settings:
lll:
# Max line length, lines longer will be reported.
# '\t' is counted as 1 character by default, and can be changed with the tab-width option.
# Default: 120.
line-length: 150
# Tab width in spaces.
# Default: 1
tab-width: 1
5 changes: 3 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
archives:
- id: archive
name_template: '{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}'
Expand All @@ -17,10 +18,10 @@ builds:
- windows
- linux
ldflags:
- -X github.com/pulumiverse/pulumi-zitadel/provider/pkg/version.Version={{.Tag }}
- -X github.com/scoretechnologies/pulumi-zitadel/provider/pkg/version.Version={{.Tag }}
main: ./cmd/pulumi-resource-zitadel/
changelog:
skip: true
disable: true
release:
disable: false
prerelease: auto
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PROJECT_NAME := zitadel Package

SHELL := /bin/bash
PACK := zitadel
ORG := pulumiverse
ORG := scoretechnologies
PROJECT := github.com/${ORG}/pulumi-${PACK}
NODE_MODULE_NAME := @pulumi/${PACK}
TF_NAME := ${PACK}
Expand Down Expand Up @@ -61,9 +61,9 @@ build_nodejs:: VERSION := $(shell pulumictl get version --language javascript)
build_nodejs:: install_plugins tfgen # build the node sdk
$(WORKING_DIR)/bin/$(TFGEN) nodejs --overlays provider/overlays/nodejs --out sdk/nodejs/
cd sdk/nodejs/ && \
yarn install && \
yarn run tsc && \
cp ../../README.md ../../LICENSE package.json yarn.lock ./bin/ && \
pnpm install && \
pnpm run build && \
cp ../../README.md ../../LICENSE package.json pnpm-lock.yaml ./bin/ && \
sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json

build_python:: PYPI_VERSION := $(shell pulumictl get version --language python)
Expand Down Expand Up @@ -116,7 +116,7 @@ install_python_sdk::
install_go_sdk::

install_nodejs_sdk::
yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin
pnpm link --dir $(WORKING_DIR)/sdk/nodejs/bin

install_sdks:: install_dotnet_sdk install_python_sdk install_nodejs_sdk

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ This package is available for several languages/platforms:
To use from JavaScript or TypeScript in Node.js, install using either `npm`:

```bash
npm install @pulumiverse/zitadel
npm install @scoretechnologies/zitadel
```

or `yarn`:

```bash
yarn add @pulumiverse/zitadel
yarn add @scoretechnologies/zitadel
```

### Python
Expand All @@ -33,15 +33,15 @@ pip install pulumi_zitadel
To use from Go, use `go get` to grab the latest version of the library:

```bash
go get github.com/pulumiverse/pulumi-zitadel/sdk/go/...
go get github.com/scoretechnologies/pulumi-zitadel/sdk/go/...
```

### .NET

To use from .NET, install using `dotnet add package`:

```bash
dotnet add package Pulumiverse.Zitadel
dotnet add package scoretechnologies.Zitadel
```

## Configuration
Expand Down
8 changes: 4 additions & 4 deletions docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The Zitadel provider must be configured with credentials to deploy and update re
{{% choosable language typescript %}}

```typescript
import * as zitadel from "@pulumiverse/zitadel";
import * as zitadel from "@scoretechnologies/zitadel";
const db = new zitadel.Org("example", {
name: "example",
});
Expand All @@ -23,7 +23,7 @@ const db = new zitadel.Org("example", {
{{% choosable language python %}}

```python
import pulumiverse_zitadel as zitadel
import scoretechnologies_zitadel as zitadel

db = zitadel.Database("example",
name="example"
Expand All @@ -36,7 +36,7 @@ db = zitadel.Database("example",
```go
import (
"fmt"
zitadel "github.com/pulumiverse/pulumi-zitadel/sdk/go/zitadel"
zitadel "github.com/scoretechnologies/pulumi-zitadel/sdk/go/zitadel"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
)

Expand All @@ -62,7 +62,7 @@ func main() {

```csharp
using Pulumi;
using Pulumiverse.Zitadel;
using scoretechnologies.Zitadel;

class Zitadel : Stack
{
Expand Down
8 changes: 4 additions & 4 deletions docs/installation-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ layout: installation

The Pulumi Zitadel provider is available as a package in all Pulumi languages:

* JavaScript/TypeScript: [`@pulumiserve/zitadel`](https://www.npmjs.com/package/@pulumiverse/zitadel)
* Python: [`pulumiverse_zitadel`](https://pypi.org/project/pulumiverse-zitadel/)
* Go: [`github.com/pulumiverse/pulumi-zitadel/sdk/go/zitadel`](https://pkg.go.dev/github.com/pulumiverse/pulumi-zitadel/sdk)
* .NET: [`Pulumiverse.Zitadel`](https://www.nuget.org/packages/Pulumiverse.Zitadel)
* JavaScript/TypeScript: [`@pulumiserve/zitadel`](https://www.npmjs.com/package/@scoretechnologies/zitadel)
* Python: [`scoretechnologies_zitadel`](https://pypi.org/project/scoretechnologies-zitadel/)
* Go: [`github.com/scoretechnologies/pulumi-zitadel/sdk/go/zitadel`](https://pkg.go.dev/github.com/scoretechnologies/pulumi-zitadel/sdk)
* .NET: [`scoretechnologies.Zitadel`](https://www.nuget.org/packages/scoretechnologies.Zitadel)

## Setup

Expand Down
2 changes: 1 addition & 1 deletion examples/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/pulumiverse/pulumi-zitadel/examples
module github.com/scoretechnologies/pulumi-zitadel/examples

go 1.21

Expand Down
4 changes: 2 additions & 2 deletions provider/cmd/pulumi-resource-zitadel/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
_ "embed"

"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
zitadel "github.com/pulumiverse/pulumi-zitadel/provider"
"github.com/pulumiverse/pulumi-zitadel/provider/pkg/version"
zitadel "github.com/scoretechnologies/pulumi-zitadel/provider"
"github.com/scoretechnologies/pulumi-zitadel/provider/pkg/version"
)

//go:embed schema-embed.json
Expand Down
Loading