From f8c9e4c0afb28045e2c25bcda153ae54ebd60ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Palet?= Date: Tue, 26 Sep 2023 19:44:16 +0200 Subject: [PATCH] Move internal packages into internal folder (#33) * Move internal packages into internal folder * Fix testutil imports --- .../{ => internal}/conversion/conversion.go | 0 stackit/{ => internal}/core/core.go | 0 .../services/argus/argus_acc_test.go | 4 +- .../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 | 4 +- .../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 | 4 +- .../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 | 4 +- .../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 | 4 +- .../postgresflex/instance/datasource.go | 4 +- .../postgresflex/instance/resource.go | 6 +-- .../postgresflex/instance/resource_test.go | 0 .../postgresflex/postgresflex_acc_test.go | 4 +- .../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 | 4 +- .../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 | 4 +- .../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 | 4 +- .../resourcemanager/project/datasource.go | 6 +-- .../resourcemanager/project/resource.go | 6 +-- .../resourcemanager/project/resource_test.go | 2 +- .../resourcemanager_acc_test.go | 2 +- .../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 | 2 +- .../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, 148 insertions(+), 148 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 (98%) 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 (98%) 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 (98%) 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 (98%) 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 (98%) 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 (98%) 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 (98%) 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 (98%) 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 (99%) 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 4510cc89..2ecd7a47 100644 --- a/stackit/services/argus/argus_acc_test.go +++ b/stackit/internal/services/argus/argus_acc_test.go @@ -12,8 +12,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) var instanceResource = map[string]string{ 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 44befbb0..4695c65f 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 fdd89085..cc896154 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 dff94f44..95ebb9c3 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 617e2869..d709c490 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 10adb7e7..8e8fe7cc 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 9aa6ada0..a15bdaa0 100644 --- a/stackit/services/dns/dns_acc_test.go +++ b/stackit/internal/services/dns/dns_acc_test.go @@ -12,8 +12,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Zone resource data 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 517f3cd8..121befcf 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 36a4a7f3..59d455ee 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 6ad7d148..1383296c 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 e7740bd7..753f35f4 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 d2d951e4..5cd08f72 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 f1e32f15..8e901939 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 8b360f07..ab0a6cea 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 01b79900..793b5866 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 98% rename from stackit/services/logme/logme_acc_test.go rename to stackit/internal/services/logme/logme_acc_test.go index 543b215d..4af7a89d 100644 --- a/stackit/services/logme/logme_acc_test.go +++ b/stackit/internal/services/logme/logme_acc_test.go @@ -11,8 +11,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 a878faab..e25db628 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 54557b58..f6a4192c 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 63233d0c..c4bb7939 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 67446387..01abf254 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 98% rename from stackit/services/mariadb/mariadb_acc_test.go rename to stackit/internal/services/mariadb/mariadb_acc_test.go index 1e737d59..92c9b6b2 100644 --- a/stackit/services/mariadb/mariadb_acc_test.go +++ b/stackit/internal/services/mariadb/mariadb_acc_test.go @@ -11,8 +11,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 00747393..98cdfb3f 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 d12862ac..2fdeb703 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 885ce439..f5dc78eb 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 79191281..d6a17f76 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 98% rename from stackit/services/opensearch/opensearch_acc_test.go rename to stackit/internal/services/opensearch/opensearch_acc_test.go index 071cb71f..b5718556 100644 --- a/stackit/services/opensearch/opensearch_acc_test.go +++ b/stackit/internal/services/opensearch/opensearch_acc_test.go @@ -11,8 +11,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 a57b3032..1d812b89 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 2a9b1960..ef1f9359 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 98% rename from stackit/services/postgresflex/postgresflex_acc_test.go rename to stackit/internal/services/postgresflex/postgresflex_acc_test.go index 420fa994..0bd4267f 100644 --- a/stackit/services/postgresflex/postgresflex_acc_test.go +++ b/stackit/internal/services/postgresflex/postgresflex_acc_test.go @@ -13,8 +13,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 53a12b22..6ecd3b4f 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 cfa5772d..a72eda55 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 e4a03c4f..4c10edfb 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 76a55e23..af9a3533 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 f9afabc0..ad9e63b6 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 a4ba7a72..1f33900e 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 98% rename from stackit/services/postgresql/postgresql_acc_test.go rename to stackit/internal/services/postgresql/postgresql_acc_test.go index ef048a77..85071f2b 100644 --- a/stackit/services/postgresql/postgresql_acc_test.go +++ b/stackit/internal/services/postgresql/postgresql_acc_test.go @@ -11,8 +11,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 a87f3aea..659332db 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 8d45ea7d..1f34e0e6 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 fc7dbc9c..b9ab22c8 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 9ea6ef79..4a7ef4f4 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 98% rename from stackit/services/rabbitmq/rabbitmq_acc_test.go rename to stackit/internal/services/rabbitmq/rabbitmq_acc_test.go index a804a646..93fcf346 100644 --- a/stackit/services/rabbitmq/rabbitmq_acc_test.go +++ b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go @@ -12,8 +12,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 56b9f7dc..fb033f47 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 c8b98694..44acd619 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 e97cd252..56fabfd0 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 abb9959a..ec5342ed 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 98% rename from stackit/services/redis/redis_acc_test.go rename to stackit/internal/services/redis/redis_acc_test.go index 81ecfe62..470efcd9 100644 --- a/stackit/services/redis/redis_acc_test.go +++ b/stackit/internal/services/redis/redis_acc_test.go @@ -12,8 +12,8 @@ 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/testutil" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" ) // Instance resource data 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 e05dac19..fb39ea29 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 ccd9241b..7681221c 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 5c65ce25..93091288 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 98% rename from stackit/services/resourcemanager/resourcemanager_acc_test.go rename to stackit/internal/services/resourcemanager/resourcemanager_acc_test.go index 39872e01..cd32540a 100644 --- a/stackit/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/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 83ef3f0a..a802a58c 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 09d49e02..b053f910 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 5a56eddc..a7d7d2dd 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 5e47db80..96822999 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 fc4400aa..21c18ce9 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 99% rename from stackit/services/ske/ske_acc_test.go rename to stackit/internal/services/ske/ske_acc_test.go index d71e9760..8b7c8709 100644 --- a/stackit/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{ 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 8beaaea5..0d61348e 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 d34e016f..f345e26a 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