tools/wrapper-automation: removing the conditional support for Data…

… API V1
hashicorp · Jan 22, 2024 · fe274f3 · fe274f3
1 parent 65891e3
commit fe274f3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 31 deletions.
diff --git a/submodules/msgraph-metadata b/submodules/msgraph-metadata
diff --git a/tools/wrapper-automation/go_sdk_generator.go b/tools/wrapper-automation/go_sdk_generator.go
@@ -24,7 +24,6 @@ func (c GoSdkGeneratorCmd) Run(args []string) int {
 
 	f := flag.NewFlagSet("wrapper-automation", flag.ExitOnError)
 	f.StringVar(&arguments.ApiDefinitionsDirectory, "api-definitions-dir", "", "--api-definitions-dir=./api-definitions")
-	f.StringVar(&arguments.DataApiAssemblyPath, "data-api-assembly-path", "", "--data-api-assembly-path=../data/Pandora.Api.dll")
 	f.StringVar(&arguments.OutputDirectory, "output-dir", "", "--output-dir=../output")
 
 	if err := f.Parse(args); err != nil {

diff --git a/tools/wrapper-automation/models.go b/tools/wrapper-automation/models.go
@@ -17,33 +17,21 @@ type Arguments struct {
 }
 
 func (a Arguments) Validate() error {
-	if a.ApiDefinitionsDirectory != "" {
-		abs, err := filepath.Abs(a.ApiDefinitionsDirectory)
-		if err != nil {
-			return fmt.Errorf("determining absolute path to %q: %+v", a.ApiDefinitionsDirectory, err)
-		}
-		a.ApiDefinitionsDirectory = abs
-		if _, err := os.Stat(a.ApiDefinitionsDirectory); err != nil {
-			if os.IsNotExist(err) {
-				return fmt.Errorf("the API Definitions Directory doesn't exist at %q", a.ApiDefinitionsDirectory)
-			}
-
-			return fmt.Errorf("validating API Definitions Directory exists at %q: %+v", a.ApiDefinitionsDirectory, err)
-		}
+	if a.ApiDefinitionsDirectory == "" {
+		return fmt.Errorf("'api-definitions-dir' must be specified")
 	}
 
-	if a.DataApiAssemblyPath != "" {
-		if _, err := os.Stat(a.DataApiAssemblyPath); err != nil {
-			if os.IsNotExist(err) {
-				return fmt.Errorf("the Data API Assembly doesn't exist at %q", a.DataApiAssemblyPath)
-			}
-
-			return fmt.Errorf("validating Data API Assembly exists: %+v", err)
-		}
+	abs, err := filepath.Abs(a.ApiDefinitionsDirectory)
+	if err != nil {
+		return fmt.Errorf("determining absolute path to %q: %+v", a.ApiDefinitionsDirectory, err)
 	}
+	a.ApiDefinitionsDirectory = abs
+	if _, err := os.Stat(a.ApiDefinitionsDirectory); err != nil {
+		if os.IsNotExist(err) {
+			return fmt.Errorf("the API Definitions Directory doesn't exist at %q", a.ApiDefinitionsDirectory)
+		}
 
-	if a.ApiDefinitionsDirectory == "" && a.DataApiAssemblyPath == "" {
-		return fmt.Errorf("one of either 'api-definitions-dir' or 'data-api-assembly-path' must be specified")
+		return fmt.Errorf("validating API Definitions Directory exists at %q: %+v", a.ApiDefinitionsDirectory, err)
 	}
 
 	return nil

diff --git a/tools/wrapper-automation/rest_api_specs_importer.go b/tools/wrapper-automation/rest_api_specs_importer.go
@@ -24,7 +24,6 @@ func (c RestApiSpecsImporterCmd) Run(args []string) int {
 
 	f := flag.NewFlagSet("wrapper-automation", flag.ExitOnError)
 	f.StringVar(&arguments.ApiDefinitionsDirectory, "api-definitions-dir", "", "--api-definitions-dir=./api-definitions")
-	f.StringVar(&arguments.DataApiAssemblyPath, "data-api-assembly-path", "", "-data-api-assembly-path=../data/Pandora.Api.dll")
 	f.StringVar(&arguments.OutputDirectory, "output-dir", "", "-output-dir=../output")
 
 	if err := f.Parse(args); err != nil {

diff --git a/tools/wrapper-automation/run.go b/tools/wrapper-automation/run.go
@@ -16,10 +16,6 @@ func run(args Arguments) error {
 
 	// 1: Launch the Data API
 	dataApi := exec.Command("data-api", "serve", fmt.Sprintf("--data-directory=%s", args.ApiDefinitionsDirectory))
-	if args.DataApiAssemblyPath != "" {
-		// Data API v1
-		dataApi = exec.Command("dotnet", args.DataApiAssemblyPath)
-	}
 	env := os.Environ()
 	env = append(env, fmt.Sprintf("PANDORA_API_PORT=%d", args.DataApiPort))
 	dataApi.Env = env

diff --git a/tools/wrapper-automation/terraform_generator.go b/tools/wrapper-automation/terraform_generator.go
@@ -24,7 +24,6 @@ func (c TerraformCmd) Run(args []string) int {
 
 	f := flag.NewFlagSet("wrapper-automation", flag.ExitOnError)
 	f.StringVar(&arguments.ApiDefinitionsDirectory, "api-definitions-dir", "", "--api-definitions-dir=./api-definitions")
-	f.StringVar(&arguments.DataApiAssemblyPath, "data-api-assembly-path", "", "--data-api-assembly-path=../data/Pandora.Api.dll")
 	f.StringVar(&arguments.OutputDirectory, "output-dir", "", "--output-dir=../output")
 
 	if err := f.Parse(args); err != nil {