Update resource manager method names

hashicorp · May 12, 2023 · 3a0e48f · 3a0e48f
1 parent 08ef0d9
commit 3a0e48f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/internal/clients/project.go b/internal/clients/project.go
@@ -34,13 +34,13 @@ func GetParentOrganizationIDByProjectID(ctx context.Context, client *Client, pro
 	return project.Parent.ID, nil
 }
 
-func CreateProject(ctx context.Context, client *Client, name, organizationID string) (*resourcemodels.HashicorpCloudResourcemanagerProject, error) {
-	projectOrg := &resourcemodels.HashicorpCloudResourcemanagerResourceID{
+func CreateProject(ctx context.Context, client *Client, name, organizationID string) (*resourcemodels.ResourcemanagerProject, error) {
+	projectOrg := &resourcemodels.ResourcemanagerResourceID{
 		ID:   organizationID,
-		Type: resourcemodels.NewHashicorpCloudResourcemanagerResourceIDResourceType("ORGANIZATION"),
+		Type: resourcemodels.NewResourceIDResourceType("ORGANIZATION"),
 	}
 	projectParams := project_service.NewProjectServiceCreateParamsWithContext(ctx)
-	projectParams.Body = &resourcemodels.HashicorpCloudResourcemanagerProjectCreateRequest{
+	projectParams.Body = &resourcemodels.ResourcemanagerProjectCreateRequest{
 		Name:   name,
 		Parent: projectOrg,
 	}

diff --git a/internal/provider/project_test.go b/internal/provider/project_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/go-openapi/strfmt"
-	"github.com/hashicorp/hcp-sdk-go/clients/cloud-resource-manager/preview/2019-12-10/models"
+	"github.com/hashicorp/hcp-sdk-go/clients/cloud-resource-manager/stable/2019-12-10/models"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/stretchr/testify/assert"
@@ -47,12 +47,12 @@ func TestDetermineOldestProject(t *testing.T) {
 
 	testCases := []struct {
 		name           string
-		projArray      []*models.HashicorpCloudResourcemanagerProject
+		projArray      []*models.ResourcemanagerProject
 		expectedProjID string
 	}{
 		{
 			name: "One Project",
-			projArray: []*models.HashicorpCloudResourcemanagerProject{
+			projArray: []*models.ResourcemanagerProject{
 				{
 					CreatedAt: strfmt.DateTime(time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC)),
 					ID:        "proj1",
@@ -62,7 +62,7 @@ func TestDetermineOldestProject(t *testing.T) {
 		},
 		{
 			name: "Two Projects",
-			projArray: []*models.HashicorpCloudResourcemanagerProject{
+			projArray: []*models.ResourcemanagerProject{
 				{
 					ID:        "proj1",
 					CreatedAt: strfmt.DateTime(time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC)),
@@ -76,7 +76,7 @@ func TestDetermineOldestProject(t *testing.T) {
 		},
 		{
 			name: "Three Projects",
-			projArray: []*models.HashicorpCloudResourcemanagerProject{
+			projArray: []*models.ResourcemanagerProject{
 				{
 					ID:        "proj1",
 					CreatedAt: strfmt.DateTime(time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC)),

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -223,7 +223,7 @@ type component struct {
 type status string
 
 // getOldestProject retrieves the oldest project from a list based on its created_at time.
-func getOldestProject(projects []*models.HashicorpCloudResourcemanagerProject) (oldestProj *models.HashicorpCloudResourcemanagerProject) {
+func getOldestProject(projects []*models.ResourcemanagerProject) (oldestProj *models.ResourcemanagerProject) {
 	oldestTime := time.Now()
 
 	for _, proj := range projects {