Skip to content

Commit 91656c3

Browse files
spbsolublespbsoluble
committed
BREAKING CHANGE: Update to terraform plugin framework v1.4.2
fix(data): `keyfactor_certificate` data source refactored to use keyfactor SDK.
1 parent ed7a40a commit 91656c3

61 files changed

Lines changed: 2245 additions & 6798 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/tests.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,20 @@ jobs:
7777
KEYFACTOR_PASSWORD: ${{secrets.KEYFACTOR_PASSWORD}}
7878
KEYFACTOR_DOMAIN: ${{secrets.KEYFACTOR_DOMAIN}}
7979

80-
KEYFACTOR_CERTIFICATE_ID: ${{secrets.KEYFACTOR_CERTIFICATE_ID}}
81-
KEYFACTOR_CERTIFICATE_PASSWORD: ${{secrets.KEYFACTOR_CERTIFICATE_PASSWORD}}
82-
KEYFACTOR_CERTIFICATE_TEMPLATE_NAME: ${{secrets.KEYFACTOR_CERTIFICATE_TEMPLATE_NAME}}
83-
KEYFACTOR_CERTIFICATE_CA_DOMAIN: ${{secrets.KEYFACTOR_CERTIFICATE_CA_DOMAIN}}
84-
KEYFACTOR_CERTIFICATE_CA_NAME: ${{secrets.KEYFACTOR_CERTIFICATE_CA_NAME}}
80+
TEST_CERTIFICATE_ID: ${{secrets.TEST_CERTIFICATE_ID}}
81+
TEST_CERTIFICATE_CN: ${{secrets.TEST_CERTIFICATE_CN}}
82+
TEST_CERTIFICATE_THUMBPRINT: ${{secrets.TEST_CERTIFICATE_THUMBPRINT}}
83+
TEST_CERTIFICATE_PASSWORD: ${{secrets.TEST_CERTIFICATE_PASSWORD}}
84+
TEST_CERTIFICATE_TEMPLATE_NAME: ${{secrets.TEST_CERTIFICATE_TEMPLATE_NAME}}
85+
TEST_CERTIFICATE_CA_DOMAIN: ${{secrets.TEST_CERTIFICATE_CA_DOMAIN}}
86+
TEST_CERTIFICATE_CA_NAME: ${{secrets.TEST_CERTIFICATE_CA_NAME}}
8587

86-
KEYFACTOR_CERTIFICATE_STORE_ID: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_ID}}
87-
KEYFACTOR_CERTIFICATE_STORE_CLIENT_MACHINE: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_CLIENT_MACHINE}}
88-
KEYFACTOR_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID}}
89-
KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID1: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID1}}
90-
KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID2: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID2}}
91-
KEYFACTOR_CERTIFICATE_STORE_PASS: ${{secrets.TEST_CERTSTORE_PASS}}
88+
TEST_CERTIFICATE_STORE_ID: ${{secrets.TEST_CERTIFICATE_STORE_ID}}
89+
TEST_CERTIFICATE_STORE_CLIENT_MACHINE: ${{secrets.TEST_CERTIFICATE_STORE_CLIENT_MACHINE}}
90+
TEST_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID: ${{secrets.TEST_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID}}
91+
TEST_CERTIFICATE_STORE_CONTAINER_ID1: ${{secrets.TEST_CERTIFICATE_STORE_CONTAINER_ID1}}
92+
TEST_CERTIFICATE_STORE_CONTAINER_ID2: ${{secrets.TEST_CERTIFICATE_STORE_CONTAINER_ID2}}
93+
TEST_CERTIFICATE_STORE_PASS: ${{secrets.TEST_CERTSTORE_PASS}}
9294

9395
KEYFACTOR_DEPLOY_CERT_STOREID1: ${{secrets.KEYFACTOR_DEPLOY_CERT_STOREID1}}
9496
KEYFACTOR_DEPLOY_CERT_STOREID2: ${{secrets.KEYFACTOR_DEPLOY_CERT_STOREID2}}
@@ -104,5 +106,5 @@ jobs:
104106
KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME2: ${{secrets.KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME2}}
105107
KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME3: ${{secrets.KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME3}}
106108

107-
run: go test -v -cover ./keyfactor
109+
run: go test -v -cover ./internal/provider/v3/command
108110
timeout-minutes: 10

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ started with the development of Terraform providers is the [Terraform Plugin Doc
77
1. Clone the repository
88
```shell
99
$ mkdir -p $GOPATH/src/github.com/Keyfactor; cd $GOPATH/src/github.com/Keyfactor
10-
$ git clone git@github.com:Keyfactor/terraform-provider-keyfactor.git
10+
$ git clone git@github.com:Keyfactor/terraform-provider-v2.git
1111
```
1212
2. Enter the directory and build the provider
1313
```shell
14-
$ cd $GOPATH/src/github.com/Keyfactor/terraform-provider-keyfactor
14+
$ cd $GOPATH/src/github.com/Keyfactor/terraform-provider-v2
1515
$ make build
1616
```
1717

@@ -31,7 +31,7 @@ $ make testacc
3131
```
3232
or
3333
```bash
34-
$ go test github.com/Keyfactor/terraform-provider-keyfactor/keyfactor
34+
$ go test github.com/Keyfactor/terraform-provider-v2/v2
3535
```
3636
Note that the following environment variables must exist regardless of the test case:
3737
* ```KEYFACTOR_USERNAME```

‎GNUmakefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ PROVIDER_DIR := $(PWD)
22
TEST?=$$(go list ./... | grep -v 'vendor')
33
HOSTNAME=keyfactor.com
44
GOFMT_FILES := $$(find $(PROVIDER_DIR) -name '*.go' |grep -v vendor)
5-
NAMESPACE=keyfactor
5+
NAMESPACE=command
66
WEBSITE_REPO=https://github.com/Keyfactor/terraform-provider-keyfactor
7-
NAME=keyfactor
7+
NAME=v3
88
BINARY=terraform-provider-${NAME}
9-
VERSION=1.3.0
9+
VERSION=3.0.0
1010
OS_ARCH := $(shell go env GOOS)_$(shell go env GOARCH)
1111
BASEDIR := ~/.terraform.d/plugins
1212
INSTALLDIR := ${BASEDIR}/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ___
3636
### Mac OS/Linux
3737
```bash
3838
git clone https://github.com/Keyfactor/terraform-provider-keyfactor.git
39-
cd terraform-provider-keyfactor
39+
cd terraform-provider-v2
4040
make install
4141
```
4242

‎docs/data-sources/certificate.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "keyfactor_certificate Data Source - terraform-provider-keyfactor"
3+
page_title: "keyfactor_certificate Data Source - terraform-provider-v2"
44
subcategory: ""
55
description: |-
66

‎docs/data-sources/certificate_store.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "keyfactor_certificate_store Data Source - terraform-provider-keyfactor"
3+
page_title: "keyfactor_certificate_store Data Source - terraform-provider-v2"
44
subcategory: ""
55
description: |-
66

‎docs/data-sources/certificate_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "keyfactor_certificate_template Data Source - terraform-provider-keyfactor"
3+
page_title: "keyfactor_certificate_template Data Source - terraform-provider-v2"
44
subcategory: ""
55
description: |-
66

‎docs/data-sources/identity.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "keyfactor_identity Data Source - terraform-provider-keyfactor"
3+
page_title: "keyfactor_identity Data Source - terraform-provider-v2"
44
subcategory: ""
55
description: |-
66

‎docs/data-sources/role.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "keyfactor_role Data Source - terraform-provider-keyfactor"
3+
page_title: "keyfactor_role Data Source - terraform-provider-v2"
44
subcategory: ""
55
description: |-
66

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# generated by https://github.com/hashicorp/terraform-plugin-docs
3-
page_title: "keyfactor Provider"
3+
page_title: "v2 Provider"
44
subcategory: ""
55
description: |-
66

0 commit comments

Comments
 (0)