diff --git a/Makefile b/Makefile index 8dbc5957..c6b3f9ac 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ ROOT_DIR ?= $(shell git rev-parse --show-toplevel) SCRIPTS_BASE ?= $(ROOT_DIR)/scripts +VERSION ?= ${VER} # SETUP AND TOOL INITIALIZATION TASKS project-help: @@ -57,3 +58,11 @@ test-acceptance-tf: TF_ACC_REGION=$(TF_ACC_REGION) \ go test ./... -count=1 -timeout=30m && \ cd $(ROOT_DIR) + +publish: build +ifeq ($(strip $(VERSION)),) + @echo "please call like this: VER=0.1.0 make publish" +else + @echo "version: $(VERSION)" +endif + diff --git a/sample/postgres/postresql.tf b/sample/postgres/postresql.tf index 57a13fae..27595809 100644 --- a/sample/postgres/postresql.tf +++ b/sample/postgres/postresql.tf @@ -51,22 +51,23 @@ resource "stackitprivatepreview_postgresflexalpha_user" "ptlsdbuser" { } resource "stackitprivatepreview_postgresflexalpha_database" "example" { + count = 25 depends_on = [stackitprivatepreview_postgresflexalpha_user.ptlsdbadminuser] project_id = var.project_id instance_id = stackitprivatepreview_postgresflexalpha_instance.msh-sna-pe-example.instance_id - name = var.db_name + name = "${var.db_name}${count.index}" owner = var.db_admin_username } -data "stackitprivatepreview_postgresflexalpha_instance" "datapsql" { - project_id = var.project_id - instance_id = var.instance_id - region = "eu01" -} +# data "stackitprivatepreview_postgresflexalpha_instance" "datapsql" { +# project_id = var.project_id +# instance_id = var.instance_id +# region = "eu01" +# } -output "psql_instance_id" { - value = data.stackitprivatepreview_postgresflexalpha_instance.datapsql.instance_id -} +# output "psql_instance_id" { +# value = data.stackitprivatepreview_postgresflexalpha_instance.datapsql.instance_id +# } output "psql_user_password" { value = stackitprivatepreview_postgresflexalpha_user.ptlsdbuser.password diff --git a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go index 9c2f9214..c7cd9096 100644 --- a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go @@ -4,6 +4,7 @@ package postgresflex_test import ( "context" + _ "embed" "fmt" "strings" "testing" @@ -20,6 +21,11 @@ import ( postgresflex "github.com/mhenselin/terraform-provider-stackitprivatepreview/pkg/postgresflexalpha" ) +var ( + //go:embed testdata/resource-complete.tf + resourceSecurityGroupMinConfig string +) + // Instance resource data var instanceResource = map[string]string{ "project_id": testutil.ProjectId, diff --git a/stackit/internal/services/postgresflexalpha/testdata/resource-complete.tf b/stackit/internal/services/postgresflexalpha/testdata/resource-complete.tf new file mode 100644 index 00000000..e69de29b