From 36ab20980a8c4755db16876888c427beb1df7c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Palet?= Date: Tue, 26 Sep 2023 18:04:58 +0100 Subject: [PATCH 1/2] Move internal packages into internal folder --- .../{ => internal}/conversion/conversion.go | 0 stackit/{ => internal}/core/core.go | 0 .../services/argus/argus_acc_test.go | 2 +- .../services/argus/credential/resource.go | 4 +- .../argus/credential/resource_test.go | 0 .../services/argus/instance/datasource.go | 4 +- .../services/argus/instance/resource.go | 4 +- .../services/argus/instance/resource_test.go | 0 .../services/argus/scrapeconfig/datasource.go | 4 +- .../services/argus/scrapeconfig/resource.go | 6 +-- .../argus/scrapeconfig/resource_test.go | 0 .../services/dns/dns_acc_test.go | 2 +- .../services/dns/recordset/datasource.go | 4 +- .../services/dns/recordset/resource.go | 6 +-- .../services/dns/recordset/resource_test.go | 0 .../services/dns/zone/datasource.go | 4 +- .../services/dns/zone/resource.go | 6 +-- .../services/dns/zone/resource_test.go | 0 .../services/logme/credentials/datasource.go | 4 +- .../services/logme/credentials/resource.go | 6 +-- .../logme/credentials/resource_test.go | 0 .../services/logme/instance/datasource.go | 4 +- .../services/logme/instance/resource.go | 4 +- .../services/logme/instance/resource_test.go | 0 .../services/logme/logme_acc_test.go | 2 +- .../mariadb/credentials/datasource.go | 4 +- .../services/mariadb/credentials/resource.go | 6 +-- .../mariadb/credentials/resource_test.go | 0 .../services/mariadb/instance/datasource.go | 4 +- .../services/mariadb/instance/resource.go | 4 +- .../mariadb/instance/resource_test.go | 0 .../services/mariadb/mariadb_acc_test.go | 2 +- .../opensearch/credentials/datasource.go | 4 +- .../opensearch/credentials/resource.go | 6 +-- .../opensearch/credentials/resource_test.go | 0 .../opensearch/instance/datasource.go | 4 +- .../services/opensearch/instance/resource.go | 4 +- .../opensearch/instance/resource_test.go | 0 .../opensearch/opensearch_acc_test.go | 2 +- .../postgresflex/instance/datasource.go | 4 +- .../postgresflex/instance/resource.go | 6 +-- .../postgresflex/instance/resource_test.go | 0 .../postgresflex/postgresflex_acc_test.go | 2 +- .../services/postgresflex/user/datasource.go | 6 +-- .../services/postgresflex/user/resource.go | 6 +-- .../postgresflex/user/resource_test.go | 0 .../postgresql/credentials/datasource.go | 4 +- .../postgresql/credentials/resource.go | 6 +-- .../postgresql/credentials/resource_test.go | 0 .../postgresql/instance/datasource.go | 4 +- .../services/postgresql/instance/resource.go | 6 +-- .../postgresql/instance/resource_test.go | 0 .../postgresql/postgresql_acc_test.go | 2 +- .../rabbitmq/credentials/datasource.go | 4 +- .../services/rabbitmq/credentials/resource.go | 6 +-- .../rabbitmq/credentials/resource_test.go | 0 .../services/rabbitmq/instance/datasource.go | 4 +- .../services/rabbitmq/instance/resource.go | 4 +- .../rabbitmq/instance/resource_test.go | 0 .../services/rabbitmq/rabbitmq_acc_test.go | 2 +- .../services/redis/credentials/datasource.go | 4 +- .../services/redis/credentials/resource.go | 6 +-- .../redis/credentials/resource_test.go | 0 .../services/redis/instance/datasource.go | 4 +- .../services/redis/instance/resource.go | 4 +- .../services/redis/instance/resource_test.go | 0 .../services/redis/redis_acc_test.go | 2 +- .../resourcemanager/project/datasource.go | 6 +-- .../resourcemanager/project/resource.go | 6 +-- .../resourcemanager/project/resource_test.go | 2 +- .../resourcemanager_acc_test.go | 0 .../services/ske/cluster/datasource.go | 4 +- .../services/ske/cluster/resource.go | 6 +-- .../services/ske/cluster/resource_test.go | 2 +- .../services/ske/project/datasource.go | 4 +- .../services/ske/project/resource.go | 4 +- .../services/ske/ske_acc_test.go | 0 .../testutil/sdk_credentials_invalid.json | 0 .../testutil/sdk_credentials_valid.json | 0 stackit/{ => internal}/testutil/testutil.go | 0 stackit/{ => internal}/validate/validate.go | 2 +- .../{ => internal}/validate/validate_test.go | 0 stackit/provider.go | 46 +++++++++---------- 83 files changed, 137 insertions(+), 137 deletions(-) rename stackit/{ => internal}/conversion/conversion.go (100%) rename stackit/{ => internal}/core/core.go (100%) rename stackit/{ => internal}/services/argus/argus_acc_test.go (99%) rename stackit/{ => internal}/services/argus/credential/resource.go (98%) rename stackit/{ => internal}/services/argus/credential/resource_test.go (100%) rename stackit/{ => internal}/services/argus/instance/datasource.go (97%) rename stackit/{ => internal}/services/argus/instance/resource.go (99%) rename stackit/{ => internal}/services/argus/instance/resource_test.go (100%) rename stackit/{ => internal}/services/argus/scrapeconfig/datasource.go (97%) rename stackit/{ => internal}/services/argus/scrapeconfig/resource.go (98%) rename stackit/{ => internal}/services/argus/scrapeconfig/resource_test.go (100%) rename stackit/{ => internal}/services/dns/dns_acc_test.go (99%) rename stackit/{ => internal}/services/dns/recordset/datasource.go (97%) rename stackit/{ => internal}/services/dns/recordset/resource.go (98%) rename stackit/{ => internal}/services/dns/recordset/resource_test.go (100%) rename stackit/{ => internal}/services/dns/zone/datasource.go (97%) rename stackit/{ => internal}/services/dns/zone/resource.go (98%) rename stackit/{ => internal}/services/dns/zone/resource_test.go (100%) rename stackit/{ => internal}/services/logme/credentials/datasource.go (97%) rename stackit/{ => internal}/services/logme/credentials/resource.go (98%) rename stackit/{ => internal}/services/logme/credentials/resource_test.go (100%) rename stackit/{ => internal}/services/logme/instance/datasource.go (97%) rename stackit/{ => internal}/services/logme/instance/resource.go (99%) rename stackit/{ => internal}/services/logme/instance/resource_test.go (100%) rename stackit/{ => internal}/services/logme/logme_acc_test.go (99%) rename stackit/{ => internal}/services/mariadb/credentials/datasource.go (97%) rename stackit/{ => internal}/services/mariadb/credentials/resource.go (98%) rename stackit/{ => internal}/services/mariadb/credentials/resource_test.go (100%) rename stackit/{ => internal}/services/mariadb/instance/datasource.go (97%) rename stackit/{ => internal}/services/mariadb/instance/resource.go (99%) rename stackit/{ => internal}/services/mariadb/instance/resource_test.go (100%) rename stackit/{ => internal}/services/mariadb/mariadb_acc_test.go (99%) rename stackit/{ => internal}/services/opensearch/credentials/datasource.go (97%) rename stackit/{ => internal}/services/opensearch/credentials/resource.go (98%) rename stackit/{ => internal}/services/opensearch/credentials/resource_test.go (100%) rename stackit/{ => internal}/services/opensearch/instance/datasource.go (97%) rename stackit/{ => internal}/services/opensearch/instance/resource.go (99%) rename stackit/{ => internal}/services/opensearch/instance/resource_test.go (100%) rename stackit/{ => internal}/services/opensearch/opensearch_acc_test.go (99%) rename stackit/{ => internal}/services/postgresflex/instance/datasource.go (97%) rename stackit/{ => internal}/services/postgresflex/instance/resource.go (98%) rename stackit/{ => internal}/services/postgresflex/instance/resource_test.go (100%) rename stackit/{ => internal}/services/postgresflex/postgresflex_acc_test.go (99%) rename stackit/{ => internal}/services/postgresflex/user/datasource.go (96%) rename stackit/{ => internal}/services/postgresflex/user/resource.go (98%) rename stackit/{ => internal}/services/postgresflex/user/resource_test.go (100%) rename stackit/{ => internal}/services/postgresql/credentials/datasource.go (97%) rename stackit/{ => internal}/services/postgresql/credentials/resource.go (98%) rename stackit/{ => internal}/services/postgresql/credentials/resource_test.go (100%) rename stackit/{ => internal}/services/postgresql/instance/datasource.go (97%) rename stackit/{ => internal}/services/postgresql/instance/resource.go (99%) rename stackit/{ => internal}/services/postgresql/instance/resource_test.go (100%) rename stackit/{ => internal}/services/postgresql/postgresql_acc_test.go (99%) rename stackit/{ => internal}/services/rabbitmq/credentials/datasource.go (97%) rename stackit/{ => internal}/services/rabbitmq/credentials/resource.go (98%) rename stackit/{ => internal}/services/rabbitmq/credentials/resource_test.go (100%) rename stackit/{ => internal}/services/rabbitmq/instance/datasource.go (97%) rename stackit/{ => internal}/services/rabbitmq/instance/resource.go (99%) rename stackit/{ => internal}/services/rabbitmq/instance/resource_test.go (100%) rename stackit/{ => internal}/services/rabbitmq/rabbitmq_acc_test.go (99%) rename stackit/{ => internal}/services/redis/credentials/datasource.go (97%) rename stackit/{ => internal}/services/redis/credentials/resource.go (98%) rename stackit/{ => internal}/services/redis/credentials/resource_test.go (100%) rename stackit/{ => internal}/services/redis/instance/datasource.go (97%) rename stackit/{ => internal}/services/redis/instance/resource.go (99%) rename stackit/{ => internal}/services/redis/instance/resource_test.go (100%) rename stackit/{ => internal}/services/redis/redis_acc_test.go (99%) rename stackit/{ => internal}/services/resourcemanager/project/datasource.go (96%) rename stackit/{ => internal}/services/resourcemanager/project/resource.go (98%) rename stackit/{ => internal}/services/resourcemanager/project/resource_test.go (98%) rename stackit/{ => internal}/services/resourcemanager/resourcemanager_acc_test.go (100%) rename stackit/{ => internal}/services/ske/cluster/datasource.go (98%) rename stackit/{ => internal}/services/ske/cluster/resource.go (99%) rename stackit/{ => internal}/services/ske/cluster/resource_test.go (99%) rename stackit/{ => internal}/services/ske/project/datasource.go (96%) rename stackit/{ => internal}/services/ske/project/resource.go (98%) rename stackit/{ => internal}/services/ske/ske_acc_test.go (100%) rename stackit/{ => internal}/testutil/sdk_credentials_invalid.json (100%) rename stackit/{ => internal}/testutil/sdk_credentials_valid.json (100%) rename stackit/{ => internal}/testutil/testutil.go (100%) rename stackit/{ => internal}/validate/validate.go (97%) rename stackit/{ => internal}/validate/validate_test.go (100%) diff --git a/stackit/conversion/conversion.go b/stackit/internal/conversion/conversion.go similarity index 100% rename from stackit/conversion/conversion.go rename to stackit/internal/conversion/conversion.go diff --git a/stackit/core/core.go b/stackit/internal/core/core.go similarity index 100% rename from stackit/core/core.go rename to stackit/internal/core/core.go diff --git a/stackit/services/argus/argus_acc_test.go b/stackit/internal/services/argus/argus_acc_test.go similarity index 99% rename from stackit/services/argus/argus_acc_test.go rename to stackit/internal/services/argus/argus_acc_test.go index 4510cc89f..4961b3a7b 100644 --- a/stackit/services/argus/argus_acc_test.go +++ b/stackit/internal/services/argus/argus_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/argus" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/argus/credential/resource.go b/stackit/internal/services/argus/credential/resource.go similarity index 98% rename from stackit/services/argus/credential/resource.go rename to stackit/internal/services/argus/credential/resource.go index 44befbb00..4695c65f9 100644 --- a/stackit/services/argus/credential/resource.go +++ b/stackit/internal/services/argus/credential/resource.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/argus" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/argus/credential/resource_test.go b/stackit/internal/services/argus/credential/resource_test.go similarity index 100% rename from stackit/services/argus/credential/resource_test.go rename to stackit/internal/services/argus/credential/resource_test.go diff --git a/stackit/services/argus/instance/datasource.go b/stackit/internal/services/argus/instance/datasource.go similarity index 97% rename from stackit/services/argus/instance/datasource.go rename to stackit/internal/services/argus/instance/datasource.go index fdd890853..cc896154f 100644 --- a/stackit/services/argus/instance/datasource.go +++ b/stackit/internal/services/argus/instance/datasource.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/argus" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/argus/instance/resource.go b/stackit/internal/services/argus/instance/resource.go similarity index 99% rename from stackit/services/argus/instance/resource.go rename to stackit/internal/services/argus/instance/resource.go index dff94f441..95ebb9c3a 100644 --- a/stackit/services/argus/instance/resource.go +++ b/stackit/internal/services/argus/instance/resource.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/argus" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/argus/instance/resource_test.go b/stackit/internal/services/argus/instance/resource_test.go similarity index 100% rename from stackit/services/argus/instance/resource_test.go rename to stackit/internal/services/argus/instance/resource_test.go diff --git a/stackit/services/argus/scrapeconfig/datasource.go b/stackit/internal/services/argus/scrapeconfig/datasource.go similarity index 97% rename from stackit/services/argus/scrapeconfig/datasource.go rename to stackit/internal/services/argus/scrapeconfig/datasource.go index 617e28691..d709c4908 100644 --- a/stackit/services/argus/scrapeconfig/datasource.go +++ b/stackit/internal/services/argus/scrapeconfig/datasource.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/argus" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/argus/scrapeconfig/resource.go b/stackit/internal/services/argus/scrapeconfig/resource.go similarity index 98% rename from stackit/services/argus/scrapeconfig/resource.go rename to stackit/internal/services/argus/scrapeconfig/resource.go index 10adb7e7f..8e8fe7cc5 100644 --- a/stackit/services/argus/scrapeconfig/resource.go +++ b/stackit/internal/services/argus/scrapeconfig/resource.go @@ -23,9 +23,9 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/argus" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) const ( diff --git a/stackit/services/argus/scrapeconfig/resource_test.go b/stackit/internal/services/argus/scrapeconfig/resource_test.go similarity index 100% rename from stackit/services/argus/scrapeconfig/resource_test.go rename to stackit/internal/services/argus/scrapeconfig/resource_test.go diff --git a/stackit/services/dns/dns_acc_test.go b/stackit/internal/services/dns/dns_acc_test.go similarity index 99% rename from stackit/services/dns/dns_acc_test.go rename to stackit/internal/services/dns/dns_acc_test.go index 9aa6ada0c..ffe374626 100644 --- a/stackit/services/dns/dns_acc_test.go +++ b/stackit/internal/services/dns/dns_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/dns" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/dns/recordset/datasource.go b/stackit/internal/services/dns/recordset/datasource.go similarity index 97% rename from stackit/services/dns/recordset/datasource.go rename to stackit/internal/services/dns/recordset/datasource.go index 517f3cd82..121befcf2 100644 --- a/stackit/services/dns/recordset/datasource.go +++ b/stackit/internal/services/dns/recordset/datasource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/dns" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/dns/recordset/resource.go b/stackit/internal/services/dns/recordset/resource.go similarity index 98% rename from stackit/services/dns/recordset/resource.go rename to stackit/internal/services/dns/recordset/resource.go index 36a4a7f3b..59d455eec 100644 --- a/stackit/services/dns/recordset/resource.go +++ b/stackit/internal/services/dns/recordset/resource.go @@ -21,9 +21,9 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/dns" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/dns/recordset/resource_test.go b/stackit/internal/services/dns/recordset/resource_test.go similarity index 100% rename from stackit/services/dns/recordset/resource_test.go rename to stackit/internal/services/dns/recordset/resource_test.go diff --git a/stackit/services/dns/zone/datasource.go b/stackit/internal/services/dns/zone/datasource.go similarity index 97% rename from stackit/services/dns/zone/datasource.go rename to stackit/internal/services/dns/zone/datasource.go index 6ad7d1486..1383296c9 100644 --- a/stackit/services/dns/zone/datasource.go +++ b/stackit/internal/services/dns/zone/datasource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/dns" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/dns/zone/resource.go b/stackit/internal/services/dns/zone/resource.go similarity index 98% rename from stackit/services/dns/zone/resource.go rename to stackit/internal/services/dns/zone/resource.go index e7740bd7b..753f35f46 100644 --- a/stackit/services/dns/zone/resource.go +++ b/stackit/internal/services/dns/zone/resource.go @@ -24,9 +24,9 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/dns" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/dns/zone/resource_test.go b/stackit/internal/services/dns/zone/resource_test.go similarity index 100% rename from stackit/services/dns/zone/resource_test.go rename to stackit/internal/services/dns/zone/resource_test.go diff --git a/stackit/services/logme/credentials/datasource.go b/stackit/internal/services/logme/credentials/datasource.go similarity index 97% rename from stackit/services/logme/credentials/datasource.go rename to stackit/internal/services/logme/credentials/datasource.go index d2d951e44..5cd08f721 100644 --- a/stackit/services/logme/credentials/datasource.go +++ b/stackit/internal/services/logme/credentials/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/logme/credentials/resource.go b/stackit/internal/services/logme/credentials/resource.go similarity index 98% rename from stackit/services/logme/credentials/resource.go rename to stackit/internal/services/logme/credentials/resource.go index f1e32f15d..8e9019397 100644 --- a/stackit/services/logme/credentials/resource.go +++ b/stackit/internal/services/logme/credentials/resource.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/logme/credentials/resource_test.go b/stackit/internal/services/logme/credentials/resource_test.go similarity index 100% rename from stackit/services/logme/credentials/resource_test.go rename to stackit/internal/services/logme/credentials/resource_test.go diff --git a/stackit/services/logme/instance/datasource.go b/stackit/internal/services/logme/instance/datasource.go similarity index 97% rename from stackit/services/logme/instance/datasource.go rename to stackit/internal/services/logme/instance/datasource.go index 8b360f071..ab0a6cea5 100644 --- a/stackit/services/logme/instance/datasource.go +++ b/stackit/internal/services/logme/instance/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/stackitcloud/stackit-sdk-go/core/config" diff --git a/stackit/services/logme/instance/resource.go b/stackit/internal/services/logme/instance/resource.go similarity index 99% rename from stackit/services/logme/instance/resource.go rename to stackit/internal/services/logme/instance/resource.go index 01b799004..793b5866a 100644 --- a/stackit/services/logme/instance/resource.go +++ b/stackit/internal/services/logme/instance/resource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/logme/instance/resource_test.go b/stackit/internal/services/logme/instance/resource_test.go similarity index 100% rename from stackit/services/logme/instance/resource_test.go rename to stackit/internal/services/logme/instance/resource_test.go diff --git a/stackit/services/logme/logme_acc_test.go b/stackit/internal/services/logme/logme_acc_test.go similarity index 99% rename from stackit/services/logme/logme_acc_test.go rename to stackit/internal/services/logme/logme_acc_test.go index 543b215d5..4b8c6b928 100644 --- a/stackit/services/logme/logme_acc_test.go +++ b/stackit/internal/services/logme/logme_acc_test.go @@ -11,7 +11,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/logme" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/mariadb/credentials/datasource.go b/stackit/internal/services/mariadb/credentials/datasource.go similarity index 97% rename from stackit/services/mariadb/credentials/datasource.go rename to stackit/internal/services/mariadb/credentials/datasource.go index a878faabf..e25db6286 100644 --- a/stackit/services/mariadb/credentials/datasource.go +++ b/stackit/internal/services/mariadb/credentials/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/mariadb/credentials/resource.go b/stackit/internal/services/mariadb/credentials/resource.go similarity index 98% rename from stackit/services/mariadb/credentials/resource.go rename to stackit/internal/services/mariadb/credentials/resource.go index 54557b58a..f6a4192cb 100644 --- a/stackit/services/mariadb/credentials/resource.go +++ b/stackit/internal/services/mariadb/credentials/resource.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/mariadb/credentials/resource_test.go b/stackit/internal/services/mariadb/credentials/resource_test.go similarity index 100% rename from stackit/services/mariadb/credentials/resource_test.go rename to stackit/internal/services/mariadb/credentials/resource_test.go diff --git a/stackit/services/mariadb/instance/datasource.go b/stackit/internal/services/mariadb/instance/datasource.go similarity index 97% rename from stackit/services/mariadb/instance/datasource.go rename to stackit/internal/services/mariadb/instance/datasource.go index 63233d0cc..c4bb7939a 100644 --- a/stackit/services/mariadb/instance/datasource.go +++ b/stackit/internal/services/mariadb/instance/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/stackitcloud/stackit-sdk-go/core/config" diff --git a/stackit/services/mariadb/instance/resource.go b/stackit/internal/services/mariadb/instance/resource.go similarity index 99% rename from stackit/services/mariadb/instance/resource.go rename to stackit/internal/services/mariadb/instance/resource.go index 67446387f..01abf254d 100644 --- a/stackit/services/mariadb/instance/resource.go +++ b/stackit/internal/services/mariadb/instance/resource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/mariadb/instance/resource_test.go b/stackit/internal/services/mariadb/instance/resource_test.go similarity index 100% rename from stackit/services/mariadb/instance/resource_test.go rename to stackit/internal/services/mariadb/instance/resource_test.go diff --git a/stackit/services/mariadb/mariadb_acc_test.go b/stackit/internal/services/mariadb/mariadb_acc_test.go similarity index 99% rename from stackit/services/mariadb/mariadb_acc_test.go rename to stackit/internal/services/mariadb/mariadb_acc_test.go index 1e737d59d..4debd3f76 100644 --- a/stackit/services/mariadb/mariadb_acc_test.go +++ b/stackit/internal/services/mariadb/mariadb_acc_test.go @@ -11,7 +11,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/mariadb" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/opensearch/credentials/datasource.go b/stackit/internal/services/opensearch/credentials/datasource.go similarity index 97% rename from stackit/services/opensearch/credentials/datasource.go rename to stackit/internal/services/opensearch/credentials/datasource.go index 007473934..98cdfb3f3 100644 --- a/stackit/services/opensearch/credentials/datasource.go +++ b/stackit/internal/services/opensearch/credentials/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/opensearch/credentials/resource.go b/stackit/internal/services/opensearch/credentials/resource.go similarity index 98% rename from stackit/services/opensearch/credentials/resource.go rename to stackit/internal/services/opensearch/credentials/resource.go index d12862ac5..2fdeb7030 100644 --- a/stackit/services/opensearch/credentials/resource.go +++ b/stackit/internal/services/opensearch/credentials/resource.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/opensearch/credentials/resource_test.go b/stackit/internal/services/opensearch/credentials/resource_test.go similarity index 100% rename from stackit/services/opensearch/credentials/resource_test.go rename to stackit/internal/services/opensearch/credentials/resource_test.go diff --git a/stackit/services/opensearch/instance/datasource.go b/stackit/internal/services/opensearch/instance/datasource.go similarity index 97% rename from stackit/services/opensearch/instance/datasource.go rename to stackit/internal/services/opensearch/instance/datasource.go index 885ce4397..f5dc78eb5 100644 --- a/stackit/services/opensearch/instance/datasource.go +++ b/stackit/internal/services/opensearch/instance/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/stackitcloud/stackit-sdk-go/core/config" diff --git a/stackit/services/opensearch/instance/resource.go b/stackit/internal/services/opensearch/instance/resource.go similarity index 99% rename from stackit/services/opensearch/instance/resource.go rename to stackit/internal/services/opensearch/instance/resource.go index 791912819..d6a17f76b 100644 --- a/stackit/services/opensearch/instance/resource.go +++ b/stackit/internal/services/opensearch/instance/resource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/opensearch/instance/resource_test.go b/stackit/internal/services/opensearch/instance/resource_test.go similarity index 100% rename from stackit/services/opensearch/instance/resource_test.go rename to stackit/internal/services/opensearch/instance/resource_test.go diff --git a/stackit/services/opensearch/opensearch_acc_test.go b/stackit/internal/services/opensearch/opensearch_acc_test.go similarity index 99% rename from stackit/services/opensearch/opensearch_acc_test.go rename to stackit/internal/services/opensearch/opensearch_acc_test.go index 071cb71fb..48c486e50 100644 --- a/stackit/services/opensearch/opensearch_acc_test.go +++ b/stackit/internal/services/opensearch/opensearch_acc_test.go @@ -11,7 +11,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/opensearch" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/postgresflex/instance/datasource.go b/stackit/internal/services/postgresflex/instance/datasource.go similarity index 97% rename from stackit/services/postgresflex/instance/datasource.go rename to stackit/internal/services/postgresflex/instance/datasource.go index a57b30323..1d812b899 100644 --- a/stackit/services/postgresflex/instance/datasource.go +++ b/stackit/internal/services/postgresflex/instance/datasource.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/postgresflex/instance/resource.go b/stackit/internal/services/postgresflex/instance/resource.go similarity index 98% rename from stackit/services/postgresflex/instance/resource.go rename to stackit/internal/services/postgresflex/instance/resource.go index 2a9b19603..ef1f93596 100644 --- a/stackit/services/postgresflex/instance/resource.go +++ b/stackit/internal/services/postgresflex/instance/resource.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/postgresflex/instance/resource_test.go b/stackit/internal/services/postgresflex/instance/resource_test.go similarity index 100% rename from stackit/services/postgresflex/instance/resource_test.go rename to stackit/internal/services/postgresflex/instance/resource_test.go diff --git a/stackit/services/postgresflex/postgresflex_acc_test.go b/stackit/internal/services/postgresflex/postgresflex_acc_test.go similarity index 99% rename from stackit/services/postgresflex/postgresflex_acc_test.go rename to stackit/internal/services/postgresflex/postgresflex_acc_test.go index 420fa9948..f3ad729d6 100644 --- a/stackit/services/postgresflex/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflex/postgresflex_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/postgresflex/user/datasource.go b/stackit/internal/services/postgresflex/user/datasource.go similarity index 96% rename from stackit/services/postgresflex/user/datasource.go rename to stackit/internal/services/postgresflex/user/datasource.go index 53a12b227..6ecd3b4f4 100644 --- a/stackit/services/postgresflex/user/datasource.go +++ b/stackit/internal/services/postgresflex/user/datasource.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/postgresflex/user/resource.go b/stackit/internal/services/postgresflex/user/resource.go similarity index 98% rename from stackit/services/postgresflex/user/resource.go rename to stackit/internal/services/postgresflex/user/resource.go index cfa5772d0..a72eda554 100644 --- a/stackit/services/postgresflex/user/resource.go +++ b/stackit/internal/services/postgresflex/user/resource.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/postgresflex/user/resource_test.go b/stackit/internal/services/postgresflex/user/resource_test.go similarity index 100% rename from stackit/services/postgresflex/user/resource_test.go rename to stackit/internal/services/postgresflex/user/resource_test.go diff --git a/stackit/services/postgresql/credentials/datasource.go b/stackit/internal/services/postgresql/credentials/datasource.go similarity index 97% rename from stackit/services/postgresql/credentials/datasource.go rename to stackit/internal/services/postgresql/credentials/datasource.go index e4a03c4f3..4c10edfb3 100644 --- a/stackit/services/postgresql/credentials/datasource.go +++ b/stackit/internal/services/postgresql/credentials/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/postgresql/credentials/resource.go b/stackit/internal/services/postgresql/credentials/resource.go similarity index 98% rename from stackit/services/postgresql/credentials/resource.go rename to stackit/internal/services/postgresql/credentials/resource.go index 76a55e239..af9a3533f 100644 --- a/stackit/services/postgresql/credentials/resource.go +++ b/stackit/internal/services/postgresql/credentials/resource.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/postgresql/credentials/resource_test.go b/stackit/internal/services/postgresql/credentials/resource_test.go similarity index 100% rename from stackit/services/postgresql/credentials/resource_test.go rename to stackit/internal/services/postgresql/credentials/resource_test.go diff --git a/stackit/services/postgresql/instance/datasource.go b/stackit/internal/services/postgresql/instance/datasource.go similarity index 97% rename from stackit/services/postgresql/instance/datasource.go rename to stackit/internal/services/postgresql/instance/datasource.go index f9afabc0a..ad9e63b6f 100644 --- a/stackit/services/postgresql/instance/datasource.go +++ b/stackit/internal/services/postgresql/instance/datasource.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/stackitcloud/stackit-sdk-go/core/config" diff --git a/stackit/services/postgresql/instance/resource.go b/stackit/internal/services/postgresql/instance/resource.go similarity index 99% rename from stackit/services/postgresql/instance/resource.go rename to stackit/internal/services/postgresql/instance/resource.go index a4ba7a72e..1f33900e0 100644 --- a/stackit/services/postgresql/instance/resource.go +++ b/stackit/internal/services/postgresql/instance/resource.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/postgresql/instance/resource_test.go b/stackit/internal/services/postgresql/instance/resource_test.go similarity index 100% rename from stackit/services/postgresql/instance/resource_test.go rename to stackit/internal/services/postgresql/instance/resource_test.go diff --git a/stackit/services/postgresql/postgresql_acc_test.go b/stackit/internal/services/postgresql/postgresql_acc_test.go similarity index 99% rename from stackit/services/postgresql/postgresql_acc_test.go rename to stackit/internal/services/postgresql/postgresql_acc_test.go index ef048a770..b5907b287 100644 --- a/stackit/services/postgresql/postgresql_acc_test.go +++ b/stackit/internal/services/postgresql/postgresql_acc_test.go @@ -11,7 +11,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/postgresql" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/rabbitmq/credentials/datasource.go b/stackit/internal/services/rabbitmq/credentials/datasource.go similarity index 97% rename from stackit/services/rabbitmq/credentials/datasource.go rename to stackit/internal/services/rabbitmq/credentials/datasource.go index a87f3aeac..659332db3 100644 --- a/stackit/services/rabbitmq/credentials/datasource.go +++ b/stackit/internal/services/rabbitmq/credentials/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/rabbitmq/credentials/resource.go b/stackit/internal/services/rabbitmq/credentials/resource.go similarity index 98% rename from stackit/services/rabbitmq/credentials/resource.go rename to stackit/internal/services/rabbitmq/credentials/resource.go index 8d45ea7de..1f34e0e6b 100644 --- a/stackit/services/rabbitmq/credentials/resource.go +++ b/stackit/internal/services/rabbitmq/credentials/resource.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/rabbitmq/credentials/resource_test.go b/stackit/internal/services/rabbitmq/credentials/resource_test.go similarity index 100% rename from stackit/services/rabbitmq/credentials/resource_test.go rename to stackit/internal/services/rabbitmq/credentials/resource_test.go diff --git a/stackit/services/rabbitmq/instance/datasource.go b/stackit/internal/services/rabbitmq/instance/datasource.go similarity index 97% rename from stackit/services/rabbitmq/instance/datasource.go rename to stackit/internal/services/rabbitmq/instance/datasource.go index fc7dbc9ca..b9ab22c8e 100644 --- a/stackit/services/rabbitmq/instance/datasource.go +++ b/stackit/internal/services/rabbitmq/instance/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/stackitcloud/stackit-sdk-go/core/config" diff --git a/stackit/services/rabbitmq/instance/resource.go b/stackit/internal/services/rabbitmq/instance/resource.go similarity index 99% rename from stackit/services/rabbitmq/instance/resource.go rename to stackit/internal/services/rabbitmq/instance/resource.go index 9ea6ef795..4a7ef4f45 100644 --- a/stackit/services/rabbitmq/instance/resource.go +++ b/stackit/internal/services/rabbitmq/instance/resource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/rabbitmq/instance/resource_test.go b/stackit/internal/services/rabbitmq/instance/resource_test.go similarity index 100% rename from stackit/services/rabbitmq/instance/resource_test.go rename to stackit/internal/services/rabbitmq/instance/resource_test.go diff --git a/stackit/services/rabbitmq/rabbitmq_acc_test.go b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go similarity index 99% rename from stackit/services/rabbitmq/rabbitmq_acc_test.go rename to stackit/internal/services/rabbitmq/rabbitmq_acc_test.go index a804a6462..90c2a4cfd 100644 --- a/stackit/services/rabbitmq/rabbitmq_acc_test.go +++ b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/rabbitmq" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/redis/credentials/datasource.go b/stackit/internal/services/redis/credentials/datasource.go similarity index 97% rename from stackit/services/redis/credentials/datasource.go rename to stackit/internal/services/redis/credentials/datasource.go index 56b9f7dc5..fb033f47e 100644 --- a/stackit/services/redis/credentials/datasource.go +++ b/stackit/internal/services/redis/credentials/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/stackit/services/redis/credentials/resource.go b/stackit/internal/services/redis/credentials/resource.go similarity index 98% rename from stackit/services/redis/credentials/resource.go rename to stackit/internal/services/redis/credentials/resource.go index c8b986948..44acd6193 100644 --- a/stackit/services/redis/credentials/resource.go +++ b/stackit/internal/services/redis/credentials/resource.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/stackit/services/redis/credentials/resource_test.go b/stackit/internal/services/redis/credentials/resource_test.go similarity index 100% rename from stackit/services/redis/credentials/resource_test.go rename to stackit/internal/services/redis/credentials/resource_test.go diff --git a/stackit/services/redis/instance/datasource.go b/stackit/internal/services/redis/instance/datasource.go similarity index 97% rename from stackit/services/redis/instance/datasource.go rename to stackit/internal/services/redis/instance/datasource.go index e97cd252b..56fabfd01 100644 --- a/stackit/services/redis/instance/datasource.go +++ b/stackit/internal/services/redis/instance/datasource.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/stackitcloud/stackit-sdk-go/core/config" diff --git a/stackit/services/redis/instance/resource.go b/stackit/internal/services/redis/instance/resource.go similarity index 99% rename from stackit/services/redis/instance/resource.go rename to stackit/internal/services/redis/instance/resource.go index abb9959a3..ec5342edd 100644 --- a/stackit/services/redis/instance/resource.go +++ b/stackit/internal/services/redis/instance/resource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/redis/instance/resource_test.go b/stackit/internal/services/redis/instance/resource_test.go similarity index 100% rename from stackit/services/redis/instance/resource_test.go rename to stackit/internal/services/redis/instance/resource_test.go diff --git a/stackit/services/redis/redis_acc_test.go b/stackit/internal/services/redis/redis_acc_test.go similarity index 99% rename from stackit/services/redis/redis_acc_test.go rename to stackit/internal/services/redis/redis_acc_test.go index 81ecfe621..a5f8466f3 100644 --- a/stackit/services/redis/redis_acc_test.go +++ b/stackit/internal/services/redis/redis_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/redis" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" ) diff --git a/stackit/services/resourcemanager/project/datasource.go b/stackit/internal/services/resourcemanager/project/datasource.go similarity index 96% rename from stackit/services/resourcemanager/project/datasource.go rename to stackit/internal/services/resourcemanager/project/datasource.go index e05dac196..fb39ea29d 100644 --- a/stackit/services/resourcemanager/project/datasource.go +++ b/stackit/internal/services/resourcemanager/project/datasource.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" diff --git a/stackit/services/resourcemanager/project/resource.go b/stackit/internal/services/resourcemanager/project/resource.go similarity index 98% rename from stackit/services/resourcemanager/project/resource.go rename to stackit/internal/services/resourcemanager/project/resource.go index ccd9241b7..7681221cc 100644 --- a/stackit/services/resourcemanager/project/resource.go +++ b/stackit/internal/services/resourcemanager/project/resource.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/stackit/services/resourcemanager/project/resource_test.go b/stackit/internal/services/resourcemanager/project/resource_test.go similarity index 98% rename from stackit/services/resourcemanager/project/resource_test.go rename to stackit/internal/services/resourcemanager/project/resource_test.go index 5c65ce258..93091288e 100644 --- a/stackit/services/resourcemanager/project/resource_test.go +++ b/stackit/internal/services/resourcemanager/project/resource_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" ) func TestMapFields(t *testing.T) { diff --git a/stackit/services/resourcemanager/resourcemanager_acc_test.go b/stackit/internal/services/resourcemanager/resourcemanager_acc_test.go similarity index 100% rename from stackit/services/resourcemanager/resourcemanager_acc_test.go rename to stackit/internal/services/resourcemanager/resourcemanager_acc_test.go diff --git a/stackit/services/ske/cluster/datasource.go b/stackit/internal/services/ske/cluster/datasource.go similarity index 98% rename from stackit/services/ske/cluster/datasource.go rename to stackit/internal/services/ske/cluster/datasource.go index 83ef3f0ac..a802a58cd 100644 --- a/stackit/services/ske/cluster/datasource.go +++ b/stackit/internal/services/ske/cluster/datasource.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/ske" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/ske/cluster/resource.go b/stackit/internal/services/ske/cluster/resource.go similarity index 99% rename from stackit/services/ske/cluster/resource.go rename to stackit/internal/services/ske/cluster/resource.go index 09d49e025..b053f9109 100644 --- a/stackit/services/ske/cluster/resource.go +++ b/stackit/internal/services/ske/cluster/resource.go @@ -29,9 +29,9 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/ske" - "github.com/stackitcloud/terraform-provider-stackit/stackit/conversion" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" "golang.org/x/mod/semver" ) diff --git a/stackit/services/ske/cluster/resource_test.go b/stackit/internal/services/ske/cluster/resource_test.go similarity index 99% rename from stackit/services/ske/cluster/resource_test.go rename to stackit/internal/services/ske/cluster/resource_test.go index 5a56eddc9..a7d7d2dd1 100644 --- a/stackit/services/ske/cluster/resource_test.go +++ b/stackit/internal/services/ske/cluster/resource_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/ske" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" ) func TestMapFields(t *testing.T) { diff --git a/stackit/services/ske/project/datasource.go b/stackit/internal/services/ske/project/datasource.go similarity index 96% rename from stackit/services/ske/project/datasource.go rename to stackit/internal/services/ske/project/datasource.go index 5e47db80f..968229991 100644 --- a/stackit/services/ske/project/datasource.go +++ b/stackit/internal/services/ske/project/datasource.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/ske" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/ske/project/resource.go b/stackit/internal/services/ske/project/resource.go similarity index 98% rename from stackit/services/ske/project/resource.go rename to stackit/internal/services/ske/project/resource.go index fc4400aa2..21c18ce94 100644 --- a/stackit/services/ske/project/resource.go +++ b/stackit/internal/services/ske/project/resource.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/ske" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/validate" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/stackit/services/ske/ske_acc_test.go b/stackit/internal/services/ske/ske_acc_test.go similarity index 100% rename from stackit/services/ske/ske_acc_test.go rename to stackit/internal/services/ske/ske_acc_test.go diff --git a/stackit/testutil/sdk_credentials_invalid.json b/stackit/internal/testutil/sdk_credentials_invalid.json similarity index 100% rename from stackit/testutil/sdk_credentials_invalid.json rename to stackit/internal/testutil/sdk_credentials_invalid.json diff --git a/stackit/testutil/sdk_credentials_valid.json b/stackit/internal/testutil/sdk_credentials_valid.json similarity index 100% rename from stackit/testutil/sdk_credentials_valid.json rename to stackit/internal/testutil/sdk_credentials_valid.json diff --git a/stackit/testutil/testutil.go b/stackit/internal/testutil/testutil.go similarity index 100% rename from stackit/testutil/testutil.go rename to stackit/internal/testutil/testutil.go diff --git a/stackit/validate/validate.go b/stackit/internal/validate/validate.go similarity index 97% rename from stackit/validate/validate.go rename to stackit/internal/validate/validate.go index 8beaaea52..0d61348e4 100644 --- a/stackit/validate/validate.go +++ b/stackit/internal/validate/validate.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag" "github.com/hashicorp/terraform-plugin-framework/schema/validator" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" ) type Validator struct { diff --git a/stackit/validate/validate_test.go b/stackit/internal/validate/validate_test.go similarity index 100% rename from stackit/validate/validate_test.go rename to stackit/internal/validate/validate_test.go diff --git a/stackit/provider.go b/stackit/provider.go index d34e016f8..f345e26a6 100644 --- a/stackit/provider.go +++ b/stackit/provider.go @@ -9,33 +9,33 @@ import ( "github.com/hashicorp/terraform-plugin-framework/provider/schema" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" - argusCredential "github.com/stackitcloud/terraform-provider-stackit/stackit/services/argus/credential" - argusInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/argus/instance" - argusScrapeConfig "github.com/stackitcloud/terraform-provider-stackit/stackit/services/argus/scrapeconfig" - dnsRecordSet "github.com/stackitcloud/terraform-provider-stackit/stackit/services/dns/recordset" - dnsZone "github.com/stackitcloud/terraform-provider-stackit/stackit/services/dns/zone" - logMeCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/services/logme/credentials" - logMeInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/logme/instance" - mariaDBCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/services/mariadb/credentials" - mariaDBInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/mariadb/instance" - openSearchCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/services/opensearch/credentials" - openSearchInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/opensearch/instance" - postgresFlexInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/postgresflex/instance" - postgresFlexUser "github.com/stackitcloud/terraform-provider-stackit/stackit/services/postgresflex/user" - postgresCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/services/postgresql/credentials" - postgresInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/postgresql/instance" - rabbitMQCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/services/rabbitmq/credentials" - rabbitMQInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/rabbitmq/instance" - redisCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/services/redis/credentials" - redisInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/services/redis/instance" - resourceManagerProject "github.com/stackitcloud/terraform-provider-stackit/stackit/services/resourcemanager/project" - skeCluster "github.com/stackitcloud/terraform-provider-stackit/stackit/services/ske/cluster" - skeProject "github.com/stackitcloud/terraform-provider-stackit/stackit/services/ske/project" + argusCredential "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/argus/credential" + argusInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/argus/instance" + argusScrapeConfig "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/argus/scrapeconfig" + dnsRecordSet "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/dns/recordset" + dnsZone "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/dns/zone" + logMeCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/logme/credentials" + logMeInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/logme/instance" + mariaDBCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/mariadb/credentials" + mariaDBInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/mariadb/instance" + openSearchCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/opensearch/credentials" + openSearchInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/opensearch/instance" + postgresFlexInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/postgresflex/instance" + postgresFlexUser "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/postgresflex/user" + postgresCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/postgresql/credentials" + postgresInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/postgresql/instance" + rabbitMQCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/rabbitmq/credentials" + rabbitMQInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/rabbitmq/instance" + redisCredentials "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/redis/credentials" + redisInstance "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/redis/instance" + resourceManagerProject "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/resourcemanager/project" + skeCluster "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/ske/cluster" + skeProject "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/ske/project" sdkauth "github.com/stackitcloud/stackit-sdk-go/core/auth" "github.com/stackitcloud/stackit-sdk-go/core/config" - "github.com/stackitcloud/terraform-provider-stackit/stackit/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" ) // Ensure the implementation satisfies the expected interfaces From eae0130a76e97e552828e12aae57f0d4455fc2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Palet?= Date: Tue, 26 Sep 2023 18:22:14 +0100 Subject: [PATCH 2/2] Fix testutil imports --- stackit/internal/services/argus/argus_acc_test.go | 2 +- stackit/internal/services/dns/dns_acc_test.go | 2 +- stackit/internal/services/logme/logme_acc_test.go | 2 +- stackit/internal/services/mariadb/mariadb_acc_test.go | 2 +- stackit/internal/services/opensearch/opensearch_acc_test.go | 2 +- stackit/internal/services/postgresflex/postgresflex_acc_test.go | 2 +- stackit/internal/services/postgresql/postgresql_acc_test.go | 2 +- stackit/internal/services/rabbitmq/rabbitmq_acc_test.go | 2 +- stackit/internal/services/redis/redis_acc_test.go | 2 +- .../services/resourcemanager/resourcemanager_acc_test.go | 2 +- stackit/internal/services/ske/ske_acc_test.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stackit/internal/services/argus/argus_acc_test.go b/stackit/internal/services/argus/argus_acc_test.go index 4961b3a7b..2ecd7a476 100644 --- a/stackit/internal/services/argus/argus_acc_test.go +++ b/stackit/internal/services/argus/argus_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/argus" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) var instanceResource = map[string]string{ diff --git a/stackit/internal/services/dns/dns_acc_test.go b/stackit/internal/services/dns/dns_acc_test.go index ffe374626..a15bdaa04 100644 --- a/stackit/internal/services/dns/dns_acc_test.go +++ b/stackit/internal/services/dns/dns_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/dns" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Zone resource data diff --git a/stackit/internal/services/logme/logme_acc_test.go b/stackit/internal/services/logme/logme_acc_test.go index 4b8c6b928..4af7a89d5 100644 --- a/stackit/internal/services/logme/logme_acc_test.go +++ b/stackit/internal/services/logme/logme_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/logme" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/mariadb/mariadb_acc_test.go b/stackit/internal/services/mariadb/mariadb_acc_test.go index 4debd3f76..92c9b6b2f 100644 --- a/stackit/internal/services/mariadb/mariadb_acc_test.go +++ b/stackit/internal/services/mariadb/mariadb_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/mariadb" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/opensearch/opensearch_acc_test.go b/stackit/internal/services/opensearch/opensearch_acc_test.go index 48c486e50..b5718556c 100644 --- a/stackit/internal/services/opensearch/opensearch_acc_test.go +++ b/stackit/internal/services/opensearch/opensearch_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/opensearch" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/postgresflex/postgresflex_acc_test.go b/stackit/internal/services/postgresflex/postgresflex_acc_test.go index f3ad729d6..0bd4267f6 100644 --- a/stackit/internal/services/postgresflex/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflex/postgresflex_acc_test.go @@ -14,7 +14,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/services/postgresflex" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/postgresql/postgresql_acc_test.go b/stackit/internal/services/postgresql/postgresql_acc_test.go index b5907b287..85071f2b9 100644 --- a/stackit/internal/services/postgresql/postgresql_acc_test.go +++ b/stackit/internal/services/postgresql/postgresql_acc_test.go @@ -12,7 +12,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/postgresql" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go index 90c2a4cfd..93fcf3462 100644 --- a/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go +++ b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/rabbitmq" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/redis/redis_acc_test.go b/stackit/internal/services/redis/redis_acc_test.go index a5f8466f3..470efcd93 100644 --- a/stackit/internal/services/redis/redis_acc_test.go +++ b/stackit/internal/services/redis/redis_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/redis" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data diff --git a/stackit/internal/services/resourcemanager/resourcemanager_acc_test.go b/stackit/internal/services/resourcemanager/resourcemanager_acc_test.go index 39872e01a..cd32540a7 100644 --- a/stackit/internal/services/resourcemanager/resourcemanager_acc_test.go +++ b/stackit/internal/services/resourcemanager/resourcemanager_acc_test.go @@ -11,7 +11,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/resourcemanager" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Project resource data diff --git a/stackit/internal/services/ske/ske_acc_test.go b/stackit/internal/services/ske/ske_acc_test.go index d71e9760f..8b7c8709b 100644 --- a/stackit/internal/services/ske/ske_acc_test.go +++ b/stackit/internal/services/ske/ske_acc_test.go @@ -13,7 +13,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/config" "github.com/stackitcloud/stackit-sdk-go/core/utils" "github.com/stackitcloud/stackit-sdk-go/services/ske" - "github.com/stackitcloud/terraform-provider-stackit/stackit/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) var projectResource = map[string]string{