Merge pull request #13473 from transcom/revert-12622-B-19181-Create-P…

…PTAS-API

Revert "B 19181 create pptas api"

.envrc

@@ -310,7 +310,6 @@ export SERVE_API_INTERNAL=true
 export SERVE_API_GHC=true
 export SERVE_API_PRIME=true
 export SERVE_API_SUPPORT=true
-export SERVE_API_PPTAS=true
 # enable prime simulator locally
 export SERVE_PRIME_SIMULATOR=true
 

.gitignore

@@ -64,7 +64,6 @@ public/swagger-ui/*
 !public/swagger-ui/prime_v3.html
 !public/swagger-ui/ghc.html
 !public/swagger-ui/support.html
-!public/swagger-ui/pptas.html
 
 # Playwright integration tests
 playwright/.cache

.pre-commit-config.yaml

@@ -180,7 +180,7 @@ repos:
         name: Spectral yaml linter
         entry: scripts/lint-yaml-with-spectral
         language: script
-        files: swagger/(admin|prime|prime_v2|prime_v3|support|pptas).yaml
+        files: swagger/(admin|prime|prime_v2|prime_v3|support).yaml
         types: [yaml]
 
   - repo: local

.redocly.yaml

@@ -8,7 +8,6 @@ apiDefinitions:
   prime_v2: swagger-def/prime_v2.yaml
   prime_v3: swagger-def/prime_v3.yaml
   support: swagger-def/support.yaml
-  pptas: swagger-def/pptas.yaml
 lint:
   extends:
     - recommended

Makefile

@@ -213,8 +213,6 @@ admin_client_run: .client_deps.stamp ## Run MilMove Admin client
 	HOST=adminlocal \
 	yarn start
 
-
-
 #
 # ----- END CLIENT TARGETS -----
 #

cmd/milmove/serve.go

@@ -409,10 +409,6 @@ func initializeRouteOptions(v *viper.Viper, routingConfig *routing.Config) {
 	if routingConfig.ServeGHC {
 		routingConfig.GHCSwaggerPath = v.GetString(cli.GHCSwaggerFlag)
 	}
-	routingConfig.ServePPTAS = v.GetBool(cli.ServePPTASFlag)
-	if routingConfig.ServePPTAS {
-		routingConfig.PPTASSwaggerPath = v.GetString(cli.PPTASSwaggerFlag)
-	}
 	routingConfig.ServeDevlocalAuth = v.GetBool(cli.DevlocalAuthFlag)
 
 	routingConfig.GitBranch = gitBranch
@@ -437,7 +433,6 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool
 		AdminServername:  v.GetString(cli.HTTPAdminServerNameFlag),
 		OrdersServername: v.GetString(cli.HTTPOrdersServerNameFlag),
 		PrimeServername:  v.GetString(cli.HTTPPrimeServerNameFlag),
-		PPTASServerName:  v.GetString(cli.HTTPPPTASServerNameFlag),
 	}
 
 	clientAuthSecretKey := v.GetString(cli.ClientAuthSecretKeyFlag)

pkg/auth/cookie.go

@@ -20,7 +20,6 @@ type ApplicationServername struct {
 	AdminServername  string
 	OrdersServername string
 	PrimeServername  string
-	PPTASServerName  string
 }
 
 type errInvalidHostname struct {

pkg/cli/hosts.go

@@ -20,8 +20,6 @@ const (
 	HTTPOrdersServerNameFlag string = "http-orders-server-name"
 	// HTTPPrimeServerNameFlag is the HTTP GHC Prime Server Name Flag
 	HTTPPrimeServerNameFlag string = "http-prime-server-name"
-	// HTTPPPTASServerNameFlag is the HTTP PPTAS Prime Server Name Flag
-	HTTPPPTASServerNameFlag string = "http-pptas-server-name"
 	// HTTPMyServerNameLocal is the HTTP My Server Name for Local
 	HTTPMyServerNameLocal string = "milmovelocal"
 	// HTTPOfficeServerNameLocal is the HTTP Office Server Name for Local

pkg/cli/services.go

@@ -22,8 +22,6 @@ const (
 	ServeSupportFlag string = "serve-api-support"
 	// ServePrimeSimulatorFlag is the prime simulator api flag
 	ServePrimeSimulatorFlag string = "serve-prime-simulator"
-	// ServePPTASFlag is the PPTAS api service flag
-	ServePPTASFlag string = "serve-api-pptas"
 	// ServeClientCollectorFlag enables the endpoints to collect client
 	// telemetry and logs
 	ServeClientCollectorFlag string = "serve-client-collector"

pkg/cli/swagger.go

@@ -23,12 +23,10 @@ const (
 	PrimeV2SwaggerFlag string = "prime-v2-swagger"
 	// PrimeV3SwaggerFlag is the Prime V3 Swagger Flag
 	PrimeV3SwaggerFlag string = "prime-v3-swagger"
-	// SupportSwaggerFlag is the Support Swagger Flag
-	SupportSwaggerFlag string = "support-swagger"
-	// PPTASSwaggerFlag is the PPTAS Swagger Flag
-	PPTASSwaggerFlag string = "pptas-swagger"
 	// ServeSwaggerUIFlag is the Serve Swagger UI Flag
 	ServeSwaggerUIFlag string = "serve-swagger-ui"
+	// SupportSwaggerFlag is the Support Swagger Flag
+	SupportSwaggerFlag string = "support-swagger"
 )
 
 // InitSwaggerFlags initializes the Swagger command line flags
@@ -42,8 +40,7 @@ func InitSwaggerFlags(flag *pflag.FlagSet) {
 	flag.String(PrimeV2SwaggerFlag, "swagger/prime_v2.yaml", "The location of the Prime V2 API swagger definition")
 	flag.String(PrimeV3SwaggerFlag, "swagger/prime_v3.yaml", "The location of the Prime V3 API swagger definition")
 	flag.String(SupportSwaggerFlag, "swagger/support.yaml", "The location of the Support API swagger definition")
-	flag.String(PPTASSwaggerFlag, "swagger/pptas.yaml", "The location of the PPTAS Export API swagger definition")
-	flag.Bool(ServeSwaggerUIFlag, true, "Whether to serve swagger UI for the APIs")
+	flag.Bool(ServeSwaggerUIFlag, false, "Whether to serve swagger UI for the APIs")
 }
 
 // CheckSwagger validates Swagger command line flags
@@ -58,7 +55,6 @@ func CheckSwagger(v *viper.Viper) error {
 		PrimeV2SwaggerFlag,
 		PrimeV3SwaggerFlag,
 		SupportSwaggerFlag,
-		PPTASSwaggerFlag,
 	}
 
 	for _, c := range swaggerVars {