Skip to content

Commit

Permalink
Upgrade provider to v0.60.0
Browse files Browse the repository at this point in the history
This brings in Proposition DELETE
  • Loading branch information
loafoe committed Oct 7, 2024
1 parent d7fbcb9 commit a1f1e1f
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 49 deletions.
10 changes: 9 additions & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,12 @@ go get -u github.com/philips-software/[email protected]
```shell
rm -fr .work
make generate build
```
```

## Publish to marketplace

```shell
up login

make build.all publish.artifacts XPKG_REG_ORGS=xpkg.upbound.io/philips-software
```
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export TERRAFORM_VERSION := 1.5.5

export TERRAFORM_PROVIDER_SOURCE := philips-software/hsdp
export TERRAFORM_PROVIDER_REPO := https://github.com/philips-software/terraform-provider-hsdp
export TERRAFORM_PROVIDER_VERSION := 0.50.2
export TERRAFORM_PROVIDER_VERSION := 0.60.0
export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-hsdp
export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-hsdp_v${TERRAFORM_PROVIDER_VERSION}
export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://github.com/philips-software/terraform-provider-hsdp/releases/download/v${TERRAFORM_PROVIDER_VERSION}
Expand Down
15 changes: 15 additions & 0 deletions apis/iam/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions apis/iam/v1alpha1/zz_proposition_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion config/provider-metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2325,7 +2325,8 @@ resources:
{
"description": "Test Proposition",
"name": "TestProposition",
"organization_id": "${hsdp_iam_org.devorg.id}"
"organization_id": "${hsdp_iam_org.devorg.id}",
"wait_for_delete": true
}
references:
organization_id: hsdp_iam_org.devorg.id
Expand All @@ -2335,6 +2336,7 @@ resources:
id: '- The GUID of the proposition'
name: '- (Required) The name of the application'
organization_id: '- (Required) the organization ID (GUID) to attach this a proposition to'
wait_for_delete: '- (Optional, boolean) If set to true, the resource will wait for the proposition to be deleted before continuing. Default is true.'
importStatements:
- terraform import hsdp_iam_proposition.myprop a-guid
hsdp_iam_role:
Expand Down
2 changes: 1 addition & 1 deletion config/schema.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions examples-generated/iam/v1alpha1/proposition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ spec:
organizationIdSelector:
matchLabels:
testing.upbound.io/example-name: devorg
waitForDelete: true
30 changes: 15 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79
github.com/crossplane/upjet v1.4.1
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
github.com/philips-software/terraform-provider-hsdp v0.50.2
github.com/philips-software/terraform-provider-hsdp v0.60.0
github.com/pkg/errors v0.9.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
k8s.io/apimachinery v0.30.2
Expand All @@ -32,6 +32,7 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coder/websocket v1.8.12 // indirect
github.com/dave/jennifer v1.6.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
Expand Down Expand Up @@ -78,8 +79,8 @@ require (
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/hasura/go-graphql-client v0.13.0 // indirect
github.com/hashicorp/yamux v0.1.2 // indirect
github.com/hasura/go-graphql-client v0.13.1 // indirect
github.com/herkyl/patchwerk v0.0.0-20190629103337-f0ea77068152 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand Down Expand Up @@ -108,7 +109,7 @@ require (
github.com/oklog/run v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/philips-labs/siderite v0.16.6 // indirect
github.com/philips-software/go-hsdp-api v0.85.0 // indirect
github.com/philips-software/go-hsdp-api v0.86.0 // indirect
github.com/philips-software/go-nih-signer v1.5.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
Expand All @@ -130,22 +131,22 @@ require (
github.com/zclconf/go-cty-yaml v1.0.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.25.0 // indirect
golang.org/x/tools v0.26.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -155,7 +156,6 @@ require (
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
nhooyr.io/websocket v1.8.17 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
Expand Down
Loading

0 comments on commit a1f1e1f

Please sign in to comment.