From ddeafbcbb46ffd69d489cc2058c399307853bcf3 Mon Sep 17 00:00:00 2001 From: Nick Santos Date: Wed, 28 Aug 2024 10:28:44 -0400 Subject: [PATCH] repo structure: rename internal/pkg/ to internal/ Signed-off-by: Nick Santos --- internal/{pkg => }/hubclient/client.go | 0 internal/{pkg => }/hubclient/client_access_token.go | 0 internal/{pkg => }/hubclient/client_organization.go | 0 internal/{pkg => }/hubclient/client_repository.go | 0 internal/provider/data_source_access_token.go | 2 +- internal/provider/data_source_access_tokens.go | 2 +- internal/provider/data_source_org.go | 2 +- internal/provider/data_source_org_team_member.go | 2 +- internal/provider/data_source_repositories.go | 2 +- internal/provider/data_source_repository.go | 4 ++-- internal/provider/provider.go | 2 +- internal/provider/resource_access_token.go | 2 +- internal/provider/resource_org_member.go | 2 +- .../provider/resource_org_setting_image_access_management.go | 2 +- .../resource_org_setting_registry_access_management.go | 2 +- .../resource_org_setting_registry_access_management_test.go | 2 +- internal/provider/resource_org_team.go | 2 +- internal/provider/resource_org_team_member_association.go | 2 +- internal/provider/resource_repository.go | 4 ++-- internal/provider/resource_repository_team_permission.go | 2 +- internal/provider/resource_repository_team_permission_test.go | 2 +- internal/{pkg => }/repositoryutils/repositoryutils.go | 0 22 files changed, 19 insertions(+), 19 deletions(-) rename internal/{pkg => }/hubclient/client.go (100%) rename internal/{pkg => }/hubclient/client_access_token.go (100%) rename internal/{pkg => }/hubclient/client_organization.go (100%) rename internal/{pkg => }/hubclient/client_repository.go (100%) rename internal/{pkg => }/repositoryutils/repositoryutils.go (100%) diff --git a/internal/pkg/hubclient/client.go b/internal/hubclient/client.go similarity index 100% rename from internal/pkg/hubclient/client.go rename to internal/hubclient/client.go diff --git a/internal/pkg/hubclient/client_access_token.go b/internal/hubclient/client_access_token.go similarity index 100% rename from internal/pkg/hubclient/client_access_token.go rename to internal/hubclient/client_access_token.go diff --git a/internal/pkg/hubclient/client_organization.go b/internal/hubclient/client_organization.go similarity index 100% rename from internal/pkg/hubclient/client_organization.go rename to internal/hubclient/client_organization.go diff --git a/internal/pkg/hubclient/client_repository.go b/internal/hubclient/client_repository.go similarity index 100% rename from internal/pkg/hubclient/client_repository.go rename to internal/hubclient/client_repository.go diff --git a/internal/provider/data_source_access_token.go b/internal/provider/data_source_access_token.go index 75b4323..83ca55a 100644 --- a/internal/provider/data_source_access_token.go +++ b/internal/provider/data_source_access_token.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/internal/provider/data_source_access_tokens.go b/internal/provider/data_source_access_tokens.go index 356b64b..33f5f13 100644 --- a/internal/provider/data_source_access_tokens.go +++ b/internal/provider/data_source_access_tokens.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/internal/provider/data_source_org.go b/internal/provider/data_source_org.go index 88b82a1..526a996 100644 --- a/internal/provider/data_source_org.go +++ b/internal/provider/data_source_org.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/internal/provider/data_source_org_team_member.go b/internal/provider/data_source_org_team_member.go index 6bb38a1..45cccea 100644 --- a/internal/provider/data_source_org_team_member.go +++ b/internal/provider/data_source_org_team_member.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" diff --git a/internal/provider/data_source_repositories.go b/internal/provider/data_source_repositories.go index 8d1c95a..df219d2 100644 --- a/internal/provider/data_source_repositories.go +++ b/internal/provider/data_source_repositories.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/internal/provider/data_source_repository.go b/internal/provider/data_source_repository.go index 7a05b5e..0dfc4a5 100644 --- a/internal/provider/data_source_repository.go +++ b/internal/provider/data_source_repository.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" - "github.com/docker/terraform-provider-docker/internal/pkg/repositoryutils" + "github.com/docker/terraform-provider-docker/internal/hubclient" + "github.com/docker/terraform-provider-docker/internal/repositoryutils" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 585830d..5480bf3 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -6,7 +6,7 @@ import ( "os" "regexp" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/docker/terraform-provider-docker/tools" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/datasource" diff --git a/internal/provider/resource_access_token.go b/internal/provider/resource_access_token.go index c843d24..2f24614 100644 --- a/internal/provider/resource_access_token.go +++ b/internal/provider/resource_access_token.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" diff --git a/internal/provider/resource_org_member.go b/internal/provider/resource_org_member.go index 401496a..38eb3aa 100644 --- a/internal/provider/resource_org_member.go +++ b/internal/provider/resource_org_member.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" diff --git a/internal/provider/resource_org_setting_image_access_management.go b/internal/provider/resource_org_setting_image_access_management.go index 5b3a273..b969a7b 100644 --- a/internal/provider/resource_org_setting_image_access_management.go +++ b/internal/provider/resource_org_setting_image_access_management.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" diff --git a/internal/provider/resource_org_setting_registry_access_management.go b/internal/provider/resource_org_setting_registry_access_management.go index 1e9585e..feada68 100644 --- a/internal/provider/resource_org_setting_registry_access_management.go +++ b/internal/provider/resource_org_setting_registry_access_management.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" diff --git a/internal/provider/resource_org_setting_registry_access_management_test.go b/internal/provider/resource_org_setting_registry_access_management_test.go index d69d1ff..1dc3358 100644 --- a/internal/provider/resource_org_setting_registry_access_management_test.go +++ b/internal/provider/resource_org_setting_registry_access_management_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/docker/terraform-provider-docker/internal/envvar" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/internal/provider/resource_org_team.go b/internal/provider/resource_org_team.go index 12f0ea1..01c3bce 100644 --- a/internal/provider/resource_org_team.go +++ b/internal/provider/resource_org_team.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" diff --git a/internal/provider/resource_org_team_member_association.go b/internal/provider/resource_org_team_member_association.go index b5d1be2..8d5b12e 100644 --- a/internal/provider/resource_org_team_member_association.go +++ b/internal/provider/resource_org_team_member_association.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/internal/provider/resource_repository.go b/internal/provider/resource_repository.go index f873077..5b7f38c 100644 --- a/internal/provider/resource_repository.go +++ b/internal/provider/resource_repository.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" - "github.com/docker/terraform-provider-docker/internal/pkg/repositoryutils" + "github.com/docker/terraform-provider-docker/internal/hubclient" + "github.com/docker/terraform-provider-docker/internal/repositoryutils" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" diff --git a/internal/provider/resource_repository_team_permission.go b/internal/provider/resource_repository_team_permission.go index 295f914..4309532 100644 --- a/internal/provider/resource_repository_team_permission.go +++ b/internal/provider/resource_repository_team_permission.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/internal/provider/resource_repository_team_permission_test.go b/internal/provider/resource_repository_team_permission_test.go index 9f28bfc..f34bac7 100644 --- a/internal/provider/resource_repository_team_permission_test.go +++ b/internal/provider/resource_repository_team_permission_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/docker/terraform-provider-docker/internal/envvar" - "github.com/docker/terraform-provider-docker/internal/pkg/hubclient" + "github.com/docker/terraform-provider-docker/internal/hubclient" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" ) diff --git a/internal/pkg/repositoryutils/repositoryutils.go b/internal/repositoryutils/repositoryutils.go similarity index 100% rename from internal/pkg/repositoryutils/repositoryutils.go rename to internal/repositoryutils/repositoryutils.go