Skip to content

Commit

Permalink
chore: fixes for workflows before first release (#33)
Browse files Browse the repository at this point in the history
* docs: added logoUrl

* chore: comment non go sdk releases

* fix: fix workflows

* chore: try lint fix, skip other language sdks

* chore: try lint fix

* chore: try lint fix

* chore: restore upstream after building sdk

* fix: comment test running for other languages

* fix: ignore changes in upstream

* fix: ignore changes in upstream
  • Loading branch information
rmocanu-ionos authored Feb 13, 2025
1 parent 1678744 commit ca4f50b
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 31 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build_sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
fail-fast: true
matrix:
language:
- dotnet
# - dotnet
- go
- nodejs
- python
# - nodejs
# - python
steps:
- name: Checkout Repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -69,6 +69,7 @@ jobs:
uses: pulumi/git-status-check-action@v1
with:
allowed-changes: |
upstream
sdk/**/pulumi-plugin.json
sdk/dotnet/*.csproj
sdk/go/**/pulumiUtilities.go
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@ jobs:
github.com/pjbgf/sha1cd,
github.com/pulumi,
github.com/segmentio/asm,
golang.org
golang.org,
github.com/ionos-cloud/sdk-go-cert-manager,
github.com/ionos-cloud/terraform-provider-ionoscloud/v6
2 changes: 1 addition & 1 deletion .github/workflows/prerequisites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
{
echo "SCHEMA_CHANGES<<$EOF";
schema-tools compare -r github://api.github.com/pulumi -p ionoscloud -o "${{ inputs.default_branch }}" -n --local-path=provider/cmd/pulumi-resource-ionoscloud/schema.json;
schema-tools compare -r github://api.github.com/ionos-cloud -p ionoscloud -o "${{ inputs.default_branch }}" -n --local-path=provider/cmd/pulumi-resource-ionoscloud/schema.json;
echo "$EOF";
} >> "$GITHUB_ENV"
- if: inputs.is_pr && inputs.is_automated == false
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,18 @@ jobs:
uses: ./.github/actions/setup-tools
with:
tools: pulumictl, pulumicli, dotnet, go, nodejs, python
- name: Publish SDKs
if: inputs.skipJavaSdk == false
uses: pulumi/pulumi-package-publisher@696a0fe98f86d86ada2a842d1859f3e8c40d6cd7 # v0.0.21
with:
sdk: all,!java
version: ${{ inputs.version }}
- name: Publish SDKs (except Java)
if: inputs.skipJavaSdk == true
uses: pulumi/pulumi-package-publisher@696a0fe98f86d86ada2a842d1859f3e8c40d6cd7 # v0.0.21
with:
sdk: all,!java,!java
version: ${{ inputs.version }}
# - name: Publish SDKs
# if: inputs.skipJavaSdk == false
# uses: pulumi/pulumi-package-publisher@696a0fe98f86d86ada2a842d1859f3e8c40d6cd7 # v0.0.21
# with:
# sdk: all,!java
# version: ${{ inputs.version }}
# - name: Publish SDKs (except Java)
# if: inputs.skipJavaSdk == true
# uses: pulumi/pulumi-package-publisher@696a0fe98f86d86ada2a842d1859f3e8c40d6cd7 # v0.0.21
# with:
# sdk: all,!java,!java
# version: ${{ inputs.version }}
- name: Download Go SDK
uses: ./.github/actions/download-sdk
with:
Expand All @@ -142,13 +142,13 @@ jobs:
go.*
go/**
!*.tar.gz
- name: Extract python version
id: python_version
working-directory: sdk/python
run: |
pip install toml-cli==0.7.0
version=$(toml get --toml-path pyproject.toml project.version)
echo "version=${version}" >> "$GITHUB_OUTPUT"
# - name: Extract python version
# id: python_version
# working-directory: sdk/python
# run: |
# pip install toml-cli==0.7.0
# version=$(toml get --toml-path pyproject.toml project.version)
# echo "version=${version}" >> "$GITHUB_OUTPUT"

clean_up_release_labels:
name: Clean up release labels
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ jobs:
fail-fast: false
matrix:
language:
- dotnet
# - dotnet
- go
- nodejs
- python
# - nodejs
# - python
testTarget: [local]
3 changes: 2 additions & 1 deletion provider/cmd/pulumi-resource-ionoscloud/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ package main
import (
_ "embed"

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

ionoscloud "github.com/ionos-cloud/pulumi-ionoscloud/provider"
"github.com/ionos-cloud/pulumi-ionoscloud/provider/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
)

//go:embed schema.json
Expand Down
1 change: 1 addition & 0 deletions provider/cmd/pulumi-resource-ionoscloud/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"ionoscloud",
"category/cloud"
],
"logoUrl": "https://raw.githubusercontent.com/ionos-cloud/terraform-provider-ionoscloud/refs/heads/master/.github/IONOS.CLOUD.BLU.svg",
"homepage": "https://www.pulumi.com",
"license": "Apache-2.0",
"attribution": "This Pulumi package is based on the [`ionoscloud` Terraform Provider](https://github.com/ionos-cloud/terraform-provider-ionoscloud).",
Expand Down
3 changes: 2 additions & 1 deletion provider/cmd/pulumi-tfgen-ionoscloud/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
package main

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

ionoscloud "github.com/ionos-cloud/pulumi-ionoscloud/provider"
"github.com/ionos-cloud/pulumi-ionoscloud/provider/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen"
)

func main() {
Expand Down
3 changes: 1 addition & 2 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package ionoscloud

import (
"fmt"
"path"

// Allow embedding bridge-metadata.json in the provider.
Expand Down Expand Up @@ -181,7 +180,7 @@ func Provider() tfbridge.ProviderInfo {
},
},
Python: &tfbridge.PythonInfo{
PackageName: fmt.Sprintf("%s", mainPkg),
PackageName: mainPkg,
// List any Python dependencies and their version ranges
Requires: map[string]string{
"pulumi": ">=3.0.0,<4.0.0",
Expand Down

0 comments on commit ca4f50b

Please sign in to comment.