Data API V2: Refactor the data API models under sdk/dataapimodels (#…

…3375) * move data api models into sdk * remove models from dataapigeneratorjson
hashicorp · Nov 20, 2023 · 4b07392 · 4b07392
1 parent 60439bc
commit 4b07392
Show file tree

Hide file tree

Showing 31 changed files with 14 additions and 13 deletions.
diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/helpers.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/helpers.go
@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/hashicorp/go-hclog"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 )
 
 func (s Generator) workingDirectoryForResource(resource string) string {

diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/revision_id.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/revision_id.go
@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 )
 
 func OutputMetaData(workingDirectory, swaggerGitSha string) error {

diff --git a/...porter-rest-api-specs/components/dataapigeneratorjson/templater_api_version_definition.go b/...porter-rest-api-specs/components/dataapigeneratorjson/templater_api_version_definition.go
@@ -3,8 +3,8 @@ package dataapigeneratorjson
 import (
 	"sort"
 
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
 	"github.com/hashicorp/pandora/tools/importer-rest-api-specs/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 )
 
 func buildApiVersionDefinition(apiVersion string, isPreview bool, resources map[string]models.AzureApiResource) (*dataApiModels.ApiVersionDefinition, error) {

diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_constants.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_constants.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
-	"github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	"github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_models.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_models.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-hclog"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
 	importerModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_operations.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_operations.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
 	importerModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_resource_id.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_resource_id.go
@@ -3,8 +3,8 @@ package dataapigeneratorjson
 import (
 	"encoding/json"
 	"fmt"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
 	importerModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/...s/importer-rest-api-specs/components/dataapigeneratorjson/templater_service_definition.go b/...s/importer-rest-api-specs/components/dataapigeneratorjson/templater_service_definition.go
@@ -4,8 +4,8 @@ import (
 	"sort"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
 	"github.com/hashicorp/pandora/tools/importer-rest-api-specs/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 )
 
 func buildServiceDefinition(serviceName string, resourceProvider, terraformPackage *string, apiVersions []models.AzureApiDefinition) (*dataApiModels.ServiceDefinition, error) {

diff --git a/...s/importer-rest-api-specs/components/dataapigeneratorjson/templater_terraform_mappings.go b/...s/importer-rest-api-specs/components/dataapigeneratorjson/templater_terraform_mappings.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/...rest-api-specs/components/dataapigeneratorjson/templater_terraform_resource_definition.go b/...rest-api-specs/components/dataapigeneratorjson/templater_terraform_resource_definition.go
@@ -1,7 +1,7 @@
 package dataapigeneratorjson
 
 import (
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/...rter-rest-api-specs/components/dataapigeneratorjson/templater_terraform_resource_tests.go b/...rter-rest-api-specs/components/dataapigeneratorjson/templater_terraform_resource_tests.go
@@ -1,7 +1,7 @@
 package dataapigeneratorjson
 
 import (
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_terraform_schema.go b/tools/importer-rest-api-specs/components/dataapigeneratorjson/templater_terraform_schema.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
-	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
 	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
 )
 

diff --git a/...nts/dataapigeneratorjson/models/README.md → tools/sdk/dataapimodels/README.md b/...nts/dataapigeneratorjson/models/README.md → tools/sdk/dataapimodels/README.md
diff --git a/...atorjson/models/api_version_definition.go → ...k/dataapimodels/api_version_definition.go b/...atorjson/models/api_version_definition.go → ...k/dataapimodels/api_version_definition.go
diff --git a/.../dataapigeneratorjson/models/constants.go → tools/sdk/dataapimodels/constants.go b/.../dataapigeneratorjson/models/constants.go → tools/sdk/dataapimodels/constants.go
diff --git a/...s/dataapigeneratorjson/models/metadata.go → tools/sdk/dataapimodels/metadata.go b/...s/dataapigeneratorjson/models/metadata.go → tools/sdk/dataapimodels/metadata.go
diff --git a/...nts/dataapigeneratorjson/models/models.go → tools/sdk/dataapimodels/models.go b/...nts/dataapigeneratorjson/models/models.go → tools/sdk/dataapimodels/models.go
diff --git a/...generatorjson/models/object_definition.go → tools/sdk/dataapimodels/object_definition.go b/...generatorjson/models/object_definition.go → tools/sdk/dataapimodels/object_definition.go
diff --git a/...dataapigeneratorjson/models/operations.go → tools/sdk/dataapimodels/operations.go b/...dataapigeneratorjson/models/operations.go → tools/sdk/dataapimodels/operations.go
diff --git a/...rjson/models/options_object_definition.go → ...ataapimodels/options_object_definition.go b/...rjson/models/options_object_definition.go → ...ataapimodels/options_object_definition.go
diff --git a/...taapigeneratorjson/models/resource_ids.go → tools/sdk/dataapimodels/resource_ids.go b/...taapigeneratorjson/models/resource_ids.go → tools/sdk/dataapimodels/resource_ids.go
diff --git a/...eneratorjson/models/service_definition.go → ...s/sdk/dataapimodels/service_definition.go b/...eneratorjson/models/service_definition.go → ...s/sdk/dataapimodels/service_definition.go
diff --git a/...eneratorjson/models/terraform_mappings.go → ...s/sdk/dataapimodels/terraform_mappings.go b/...eneratorjson/models/terraform_mappings.go → ...s/sdk/dataapimodels/terraform_mappings.go
diff --git a/...n/models/terraform_resource_definition.go → ...pimodels/terraform_resource_definition.go b/...n/models/terraform_resource_definition.go → ...pimodels/terraform_resource_definition.go
diff --git a/...orjson/models/terraform_resource_tests.go → ...dataapimodels/terraform_resource_tests.go b/...orjson/models/terraform_resource_tests.go → ...dataapimodels/terraform_resource_tests.go
diff --git a/.../models/terraform_schema_documentation.go → ...imodels/terraform_schema_documentation.go b/.../models/terraform_schema_documentation.go → ...imodels/terraform_schema_documentation.go
diff --git a/...atorjson/models/terraform_schema_field.go → ...k/dataapimodels/terraform_schema_field.go b/...atorjson/models/terraform_schema_field.go → ...k/dataapimodels/terraform_schema_field.go
diff --git a/...dels/terraform_schema_field_validation.go → ...dels/terraform_schema_field_validation.go b/...dels/terraform_schema_field_validation.go → ...dels/terraform_schema_field_validation.go
diff --git a/...atorjson/models/terraform_schema_model.go → ...k/dataapimodels/terraform_schema_model.go b/...atorjson/models/terraform_schema_model.go → ...k/dataapimodels/terraform_schema_model.go
diff --git a/...els/terraform_schema_object_definition.go → ...els/terraform_schema_object_definition.go b/...els/terraform_schema_object_definition.go → ...els/terraform_schema_object_definition.go
diff --git a/tools/sdk/resourcemanager/service_version.go b/tools/sdk/resourcemanager/service_version.go
@@ -15,6 +15,7 @@ func (c ServiceVersionClient) Get(input ServiceVersion) (*ServiceVersionDetails,
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
 	// TODO: handle this being a 404 etc
 
@@ -23,7 +24,7 @@ func (c ServiceVersionClient) Get(input ServiceVersion) (*ServiceVersionDetails,
 		return nil, err
 	}
 
-	return &response, resp.Body.Close()
+	return &response, nil
 }
 
 type ServiceVersionDetails struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"sort"
-    	dataApiModels "github.com/hashicorp/pandora/tools/importer-rest-api-specs/components/dataapigeneratorjson/models"
+    	dataApiModels "github.com/hashicorp/pandora/tools/sdk/dataapimodels"
     	"github.com/hashicorp/pandora/tools/sdk/resourcemanager"
     )
@@ Expand Down @@