Merge pull request #43 from docker/nicks/pkg-names

repo structure: rename internal/pkg/ to internal/
docker · Aug 28, 2024 · e393dee · e393dee
2 parents 4f190d9 + ddeafbc
commit e393dee
Show file tree

Hide file tree

Showing 22 changed files with 19 additions and 19 deletions.
diff --git a/internal/pkg/hubclient/client.go → internal/hubclient/client.go b/internal/pkg/hubclient/client.go → internal/hubclient/client.go
diff --git a/...rnal/pkg/hubclient/client_access_token.go → internal/hubclient/client_access_token.go b/...rnal/pkg/hubclient/client_access_token.go → internal/hubclient/client_access_token.go
diff --git a/...rnal/pkg/hubclient/client_organization.go → internal/hubclient/client_organization.go b/...rnal/pkg/hubclient/client_organization.go → internal/hubclient/client_organization.go
diff --git a/internal/pkg/hubclient/client_repository.go → internal/hubclient/client_repository.go b/internal/pkg/hubclient/client_repository.go → internal/hubclient/client_repository.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...al/pkg/repositoryutils/repositoryutils.go → internal/repositoryutils/repositoryutils.go b/...al/pkg/repositoryutils/repositoryutils.go → internal/repositoryutils/repositoryutils.go