Skip to content

Tf framework upgrade #94

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.

Sign up for GitHub

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

Open
spbsoluble wants to merge 4 commits into
base: v2
Choose a base branch
from
Open

Tf framework upgrade #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2871c87
chore: formatting
spbsoluble Nov 1, 2023
1129c55
fix(data): `keyfactor_agent` data source refactored to use keyfactor …
spbsoluble Dec 15, 2023
003191c
fix(data): `keyfactor_certificate` data sources allow passing collect…
spbsoluble Dec 15, 2023
d01bd08
fix(data): `keyfactor_certificate_store` WIP
spbsoluble Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,23 @@ jobs:
KEYFACTOR_PASSWORD: ${{secrets.KEYFACTOR_PASSWORD}}
KEYFACTOR_DOMAIN: ${{secrets.KEYFACTOR_DOMAIN}}

KEYFACTOR_CERTIFICATE_ID: ${{secrets.KEYFACTOR_CERTIFICATE_ID}}
KEYFACTOR_CERTIFICATE_PASSWORD: ${{secrets.KEYFACTOR_CERTIFICATE_PASSWORD}}
KEYFACTOR_CERTIFICATE_TEMPLATE_NAME: ${{secrets.KEYFACTOR_CERTIFICATE_TEMPLATE_NAME}}
KEYFACTOR_CERTIFICATE_CA_DOMAIN: ${{secrets.KEYFACTOR_CERTIFICATE_CA_DOMAIN}}
KEYFACTOR_CERTIFICATE_CA_NAME: ${{secrets.KEYFACTOR_CERTIFICATE_CA_NAME}}
TEST_AGENT_ID: ${{secrets.TEST_AGENT_ID}}
TEST_AGENT_CLIENT_MACHINE_NAME: ${{secrets.TEST_AGENT_CLIENT_MACHINE_NAME}}

KEYFACTOR_CERTIFICATE_STORE_ID: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_ID}}
KEYFACTOR_CERTIFICATE_STORE_CLIENT_MACHINE: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_CLIENT_MACHINE}}
KEYFACTOR_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID}}
KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID1: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID1}}
KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID2: ${{secrets.KEYFACTOR_CERTIFICATE_STORE_CONTAINER_ID2}}
KEYFACTOR_CERTIFICATE_STORE_PASS: ${{secrets.TEST_CERTSTORE_PASS}}
TEST_CERTIFICATE_ID: ${{secrets.TEST_CERTIFICATE_ID}}
TEST_CERTIFICATE_CN: ${{secrets.TEST_CERTIFICATE_CN}}
TEST_CERTIFICATE_THUMBPRINT: ${{secrets.TEST_CERTIFICATE_THUMBPRINT}}
TEST_CERTIFICATE_PASSWORD: ${{secrets.TEST_CERTIFICATE_PASSWORD}}
TEST_CERTIFICATE_TEMPLATE_NAME: ${{secrets.TEST_CERTIFICATE_TEMPLATE_NAME}}
TEST_CERTIFICATE_CA_DOMAIN: ${{secrets.TEST_CERTIFICATE_CA_DOMAIN}}
TEST_CERTIFICATE_CA_NAME: ${{secrets.TEST_CERTIFICATE_CA_NAME}}

TEST_CERTIFICATE_STORE_ID: ${{secrets.TEST_CERTIFICATE_STORE_ID}}
TEST_CERTIFICATE_STORE_CLIENT_MACHINE: ${{secrets.TEST_CERTIFICATE_STORE_CLIENT_MACHINE}}
TEST_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID: ${{secrets.TEST_CERTIFICATE_STORE_ORCHESTRATOR_AGENT_ID}}
TEST_CERTIFICATE_STORE_CONTAINER_ID1: ${{secrets.TEST_CERTIFICATE_STORE_CONTAINER_ID1}}
TEST_CERTIFICATE_STORE_CONTAINER_ID2: ${{secrets.TEST_CERTIFICATE_STORE_CONTAINER_ID2}}
TEST_CERTIFICATE_STORE_PASS: ${{secrets.TEST_CERTSTORE_PASS}}

KEYFACTOR_DEPLOY_CERT_STOREID1: ${{secrets.KEYFACTOR_DEPLOY_CERT_STOREID1}}
KEYFACTOR_DEPLOY_CERT_STOREID2: ${{secrets.KEYFACTOR_DEPLOY_CERT_STOREID2}}
Expand All @@ -104,5 +109,5 @@ jobs:
KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME2: ${{secrets.KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME2}}
KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME3: ${{secrets.KEYFACTOR_TEMPLATE_ROLE_BINDING_TEMPLATE_NAME3}}

run: go test -v -cover ./keyfactor
run: go test -v -cover ./internal/provider/v3/command
timeout-minutes: 10
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ started with the development of Terraform providers is the [Terraform Plugin Doc
1. Clone the repository
```shell
$ mkdir -p $GOPATH/src/github.com/Keyfactor; cd $GOPATH/src/github.com/Keyfactor
$ git clone git@github.com:Keyfactor/terraform-provider-keyfactor.git
$ git clone git@github.com:Keyfactor/terraform-provider-v2.git
```
2. Enter the directory and build the provider
```shell
$ cd $GOPATH/src/github.com/Keyfactor/terraform-provider-keyfactor
$ cd $GOPATH/src/github.com/Keyfactor/terraform-provider-v2
$ make build
```

Expand All @@ -31,7 +31,7 @@ $ make testacc
```
or
```bash
$ go test github.com/Keyfactor/terraform-provider-keyfactor/keyfactor
$ go test github.com/Keyfactor/terraform-provider-v2/v2
```
Note that the following environment variables must exist regardless of the test case:
* ```KEYFACTOR_USERNAME```
Expand Down
8 changes: 4 additions & 4 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ PROVIDER_DIR := $(PWD)
TEST?=$$(go list ./... | grep -v 'vendor')
HOSTNAME=keyfactor.com
GOFMT_FILES := $$(find $(PROVIDER_DIR) -name '*.go' |grep -v vendor)
NAMESPACE=keyfactor
WEBSITE_REPO=https://github.com/Keyfactor/terraform-provider-keyfactor
NAME=keyfactor
NAMESPACE=command
WEBSITE_REPO=https://github.com/keyfactor-pub/terraform-provider-keyfactor
NAME=v3
BINARY=terraform-provider-${NAME}
VERSION=1.3.0
VERSION=3.0.0
OS_ARCH := $(shell go env GOOS)_$(shell go env GOARCH)
BASEDIR := ~/.terraform.d/plugins
INSTALLDIR := ${BASEDIR}/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ___
### Mac OS/Linux
```bash
git clone https://github.com/Keyfactor/terraform-provider-keyfactor.git
cd terraform-provider-keyfactor
cd terraform-provider-v2
make install
```

Expand Down
Loading