Support non-final routes
This commit is contained in:
		
							
								
								
									
										14
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Makefile
									
									
									
									
									
								
							@@ -20,7 +20,7 @@ schema:
 | 
			
		||||
	curl https://www.eia.gov/opendata/$(SCHEMA_ZIP) -o $(SCHEMA_DIR)/$(SCHEMA_ZIP)
 | 
			
		||||
	unzip -o $(SCHEMA_DIR)/$(SCHEMA_ZIP) -d $(SCHEMA_DIR)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/responses\/data/schemas\/DataResponseContainer/g' $(SCHEMA_DIR)/$(SCHEMA_YML)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/responses\/route/schemas\/RouteResponseContainer/g' $(SCHEMA_DIR)/$(SCHEMA_YML)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/responses\/route/schemas\/RouteResponse/g' $(SCHEMA_DIR)/$(SCHEMA_YML)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/responses\/facets/schemas\/FacetOptionListContainer/g' $(SCHEMA_DIR)/$(SCHEMA_YML)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/responses\/facet/schemas\/FacetDetailsContainer/g' $(SCHEMA_DIR)/$(SCHEMA_YML)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/responses\/final-route/schemas\/FinalRouteResponse/g' $(SCHEMA_DIR)/$(SCHEMA_YML)
 | 
			
		||||
@@ -30,15 +30,9 @@ schema:
 | 
			
		||||
# Generate code
 | 
			
		||||
generate:
 | 
			
		||||
	go generate ./...
 | 
			
		||||
ifeq ($(IS_GNU_SED), true)
 | 
			
		||||
	# Fix errors in generated code with GNU sed
 | 
			
		||||
	sed -E -i 's/Total[[:space:]]+\*int/Total *string/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
	sed -E -i 's/Command[[:space:]]+\*\[\]string/Command *string/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
else
 | 
			
		||||
	# Fix errors in generated code with BSD sed
 | 
			
		||||
	sed -E -i '' 's/Total[[:space:]]+\*int/Total *string/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
	sed -E -i '' 's/Command[[:space:]]+\*\[\]string/Command *string/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
endif
 | 
			
		||||
	sed -E $(SED_INLINE) 's/Total[[:space:]]+\*int/Total *string/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/Command[[:space:]]+\*\[\]string/Command *string/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
	sed -E $(SED_INLINE) 's/Routes[[:space:]]+\*\[\]string/Routes *[]Routes/g' $(CLIENT_GEN_FILE)
 | 
			
		||||
	# Pretty it up
 | 
			
		||||
	$(GO_FORMATTER) -w $(CLIENT_GEN_FILE)
 | 
			
		||||
	$(GO_FORMATTER) -w $(MAPPER_GEN_FILE)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user