fix(cert): certificate resouurces now allow for collection ID to be specified.

Author: spbsoluble

GNUmakefile

@@ -6,7 +6,7 @@ NAMESPACE=keyfactor
 WEBSITE_REPO=https://github.com/Keyfactor/terraform-provider-keyfactor
 NAME=keyfactor
 BINARY=terraform-provider-${NAME}
-VERSION=1.3.0-rc1
+VERSION=1.3.0
 OS_ARCH := $(shell go env GOOS)_$(shell go env GOARCH)
 BASEDIR := ~/.terraform.d/plugins
 INSTALLDIR := ${BASEDIR}/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
@@ -68,9 +68,9 @@ vendor:
 	go mod vendor
 
 tag:
-	git tag -d $(VERSION) || true
-	git push origin $(VERSION) || true
-	git tag $(VERSION) || true
-	git push origin $(VERSION) || true
+	git tag -d v$(VERSION) || true
+	git push origin v$(VERSION) || true
+	git tag v$(VERSION) || true
+	git push origin v$(VERSION) || true
 
 .PHONY: build release install test testacc fmtcheck fmt tag setversion vendor

docs/resources/certificate.md

@@ -89,6 +89,7 @@ resource "keyfactor_certificate" "kf_csr_cert" {
 
 ### Optional
 
+- `collection_id` (Number) Optional certificate collection identifier used to ensure user access to the certificate.
 - `csr` (String) Base-64 encoded certificate signing request (CSR)
 - `dns_sans` (List of String) List of DNS names to use as subjects of the certificate
 - `ip_sans` (List of String) List of DNS names to use as subjects of the certificate

keyfactor/resource_keyfactor_certificate.go

@@ -152,6 +152,12 @@ func (r resourceKeyfactorCertificateType) GetSchema(_ context.Context) (tfsdk.Sc
 				Computed:    true,
 				Description: "Keyfactor certificate ID",
 			},
+			"collection_id": {
+				Type:        types.Int64Type,
+				Required:    false,
+				Optional:    true,
+				Description: "Optional certificate collection identifier used to ensure user access to the certificate.",
+			},
 			"keyfactor_request_id": {
 				Type:        types.Int64Type,
 				Computed:    true,
@@ -284,6 +290,7 @@ func (r resourceKeyfactorCertificate) Create(ctx context.Context, request tfsdk.
 			CertificateTemplate:  plan.CertificateTemplate,
 			RequestId:            types.Int64{Value: int64(enrollResponse.CertificateInformation.KeyfactorRequestID)},
 			Metadata:             plan.Metadata,
+			CollectionId:         plan.CollectionId,
 		}
 
 		diags = response.State.Set(ctx, result)
@@ -360,6 +367,7 @@ func (r resourceKeyfactorCertificate) Create(ctx context.Context, request tfsdk.
 			CertificateTemplate:  plan.CertificateTemplate,
 			RequestId:            types.Int64{Value: int64(enrollResponse.CertificateInformation.KeyfactorRequestID)},
 			Metadata:             plan.Metadata,
+			CollectionId:         plan.CollectionId,
 		}
 
 		diags = response.State.Set(ctx, result)

main.go

@@ -31,8 +31,12 @@ func main() {
 	flag.BoolVar(&debug, "debug", false, "set to true to run the provider with support for debuggers like delve")
 	flag.Parse()
 
+	address := "github.com/keyfactor-pub/keyfactor"
+	if debug {
+		address = "keyfactor.com/keyfactor/keyfactor"
+	}
 	opts := providerserver.ServeOpts{
-		Address:         "keyfactor.com/keyfactor-pub/keyfactor",
+		Address:         address,
 		Debug:           debug,
 		ProtocolVersion: 6,
 	}