Cosmos 2065

.github/workflows/build.yml

@@ -1,5 +1,9 @@
 name: Build Compiler image
 on:
+ push:
+ branches:
+ - 'npt-632'
+ - 'main'
  pull_request:
  branches: [ main ]
 jobs:
@@ -13,8 +17,6 @@ jobs:
  uses: actions/setup-go@v3
  with:
  go-version: '>=1.17.0'
- - name: setup-docker
- uses: docker-practice/actions-setup-docker@1.0.11
  - name: 'Set up Cloud SDK'
  uses: 'google-github-actions/setup-gcloud@v0'
  - name: Build Compiler image
@@ -51,8 +53,6 @@ jobs:
  uses: actions/setup-go@v3
  with:
  go-version: '>=1.17.0'
- - name: setup-docker
- uses: docker-practice/actions-setup-docker@1.0.11
  - name: Test Generate Code and Render templates
  run: |
  git config --global url."https://github.com/".insteadOf "git@github.com:"

compiler/.gitignore

@@ -7,6 +7,7 @@ cmd/nexus-openapi-gen
 cmd/gqlgen
 compiler.tar
 _generated
+_tsm_temp
 
 ### GoLand ###
 .idea

compiler/Dockerfile

@@ -25,4 +25,4 @@ RUN CGO_ENABLED=0 go build --trimpath -o install.so ./cmd/validate
 WORKDIR /go/src/github.com/vmware-tanzu/graph-framework-for-microservices/compiler
 RUN go mod download
 
-CMD make docker.gitlab_credentials && make generate_code
+CMD make docker.gitlab_credentials && make preparser

compiler/Makefile

@@ -20,6 +20,7 @@ CONFIG_FILE ?= ""
 GENERATED_OUTPUT_DIRECTORY ?= generated
 COMPILER_SRC_DIRECTORY ?= ""
 FORCE ?= false
+PREPARSER_MODPATH ?= model
 
 NEXUS_KUBEOPENAPI_VERSION ?= 7416bd4754d3c0dd8b3fa37fff53d36594f11607
 NEXUS_GRAPHQLGEN_VERSION ?= 32f028bce22efeb70b47a640195bd969dbb337f0
@@ -140,11 +141,48 @@ generate_example_in_container:
 test_in_container: ${BUILDER_NAME}\:${BUILDER_TAG}.image.exists
  $(call run_in_container, make test)
 
+.PHONY: preparser
+preparser:
+ @echo "Nexus Compiler: Start Preparser"
+ @echo "Cleaning up workdir"
+ rm -rf _generated
+ @echo "Copying generated_base_structure to create directory structure"
+ @echo "COMPILER_SRC_DIRECTORY: ${COMPILER_SRC_DIRECTORY}"
+ cp -R _generated_base_structure _generated
+ @echo "Cleaning up temp dir"
+ rm -rf _tsm_temp
+ @echo "Copying Datamodel to temp directory"
+ cp -R ${DATAMODEL_PATH} _tsm_temp
+ cp -R _generated_base_structure/* ${DATAMODEL_PATH}/build
+ @echo "Nexus Compiler: Running Preparser"
+ go run cmd/preparser/main.go -config-file ${CONFIG_FILE} -dsl _tsm_temp -output _generated -modpath ${PREPARSER_MODPATH}
+ @echo "Nexus Compiler: Remove empty directories from model directory"
+ @find _generated/model -depth -type d -empty -delete
+
+ @if [ -d "_tsm_temp/global" ]; then \
+ cp _tsm_temp/go.mod _tsm_temp/global/go.mod; \
+ for dir in _tsm_temp/*; do \
+ if [[ -d "$$dir" && "$$dir" != "_tsm_temp/global" && "$$dir" != "_tsm_temp/build" ]]; then \
+ cp -r "$$dir" _tsm_temp/global/; \
+ fi; \
+ done; \
+ $(MAKE) generate_code DATAMODEL_PATH=_tsm_temp/global; \
+ else \
+ $(MAKE) generate_code; \
+ fi
+
+test_if:
+ for dir in _tsm_temp/*; do \
+ if [[ -d "$$dir" && "$$dir" != "_tsm_temp/global" && "$$dir" != "_tsm_temp/build" ]]; then \
+ cp -r "$$dir" _tsm_temp/global/; \
+ fi; \
+ done
+
 .PHONY: generate_code
 generate_code:
  @echo "Nexus Compiler: Running compiler code generation"
  @echo "Cleaning up workdir"
- rm -rf _generated ${GOPATH}/src/nexustempmodule
+ rm -rf ${GOPATH}/src/nexustempmodule
  @echo "Copying generated_base_structure to create directory structure"
  @echo "COMPILER_SRC_DIRECTORY: ${COMPILER_SRC_DIRECTORY}"
  cp -R _generated_base_structure _generated
@@ -164,28 +202,29 @@ generate_code:
  @echo "Nexus Compiler: Generating CRD yamls"
  go run cmd/generate-openapischema/generate-openapischema.go -yamls-path _generated/crds -existing-CRDs-Path ${GENERATED_OUTPUT_DIRECTORY}/crds -force ${FORCE}
  git checkout -- pkg/openapi_generator/openapi/openapi_generated.go
- rm -rf ${GENERATED_OUTPUT_DIRECTORY}/{client,apis,crds,common,nexus-client,helper,nexus-gql}
- cp -r _generated/{client,apis,crds,common,nexus-client,helper,nexus-gql} ${GENERATED_OUTPUT_DIRECTORY}
+ rm -rf ${GENERATED_OUTPUT_DIRECTORY}/{client,apis,crds,common,nexus-client,helper,nexus-gql,tsm-nexus-gql,model}
+ cp -r _generated/{client,apis,crds,common,nexus-client,helper,nexus-gql,tsm-nexus-gql,model} ${GENERATED_OUTPUT_DIRECTORY}
  @echo "Nexus Compiler: Generating GRAPHQL PKG"
- cd _generated && goimports -w .
+ cd _generated && mv model/model.go model/model.tmp && goimports -w . && mv model/model.tmp model/model.go
  cd _generated/nexus-gql && gqlgen generate
+ @echo "Nexus Compiler: GRAPHQL Generating completed"
  cp -rf _generated/* ${GOPATH}/src/nexustempmodule/
  cd ${GOPATH}/src/nexustempmodule && cd nexus-gql && go mod init && \
  go mod edit -replace nexustempmodule=${GOPATH}/src/nexustempmodule && \
  ${COMPILER_SRC_DIRECTORY}/scripts/pin_graphql_build_version.sh ${COMPILER_SRC_DIRECTORY} && \
- go mod tidy -e 2>/dev/null && \
- CGO_ENABLED=1 GOOS=linux \
- go build --trimpath -o graphql.so -buildmode=plugin server.go
+ go mod edit -go=1.18 && \
+ go mod tidy && \
+ CGO_ENABLED=1 GOARCH=amd64 GOOS=linux go build -ldflags="-w -s" server.go
  @echo "Updating module name"
  ./scripts/replace_mod_path.sh
  find . -name "*.bak" -type f -delete
  @echo "Sorting imports"
- cd _generated && goimports -w .
+ cd _generated && mv model/model.go model/model.tmp && goimports -w . && mv model/model.tmp model/model.go
  @echo "Nexus Compiler: Moving files to output directory"
- cp -r _generated/{client,apis,crds,common,nexus-client,helper,nexus-gql} ${GENERATED_OUTPUT_DIRECTORY}
- cp -r ${GOPATH}/src/nexustempmodule/nexus-gql/graphql.so ${GENERATED_OUTPUT_DIRECTORY}/nexus-gql
  mkdir -p ${GENERATED_OUTPUT_DIRECTORY}/install-validator
  cp -r ${GOPATH}/src/github.com/vmware-tanzu/graph-framework-for-microservices/install-validator/install.so ${GENERATED_OUTPUT_DIRECTORY}/install-validator/install.so || echo "Could not find install.so file, skipping"
+ cp -r _generated/{client,apis,crds,common,nexus-client,helper,nexus-gql,tsm-nexus-gql,model} ${GENERATED_OUTPUT_DIRECTORY}
+ cp -r ${GOPATH}/src/nexustempmodule/nexus-gql/* ${GENERATED_OUTPUT_DIRECTORY}/nexus-gql/
  @echo "Nexus Compiler: Compiler code generation completed"
 
 .PHONY: test_generate_code_in_container

compiler/builder/Dockerfile

@@ -1,5 +1,5 @@
 #graphql's and compiler's builder/Dockerfile should be in sync
-FROM gcr.io/nsx-sm/nexus/golang:1.18
+FROM gcr.io/nsx-sm/nexus/golang:1.19
 
 ENV GOPATH /go
 ENV PATH $PATH:/usr/local/go/bin:/go/bin

compiler/cmd/nexus-sdk/main.go

@@ -49,10 +49,11 @@ func main() {
  config.ConfigInstance = conf
  pkgs := parser.ParseDSLPkg(*dslDir)
  graphlqQueries := parser.ParseGraphqlQuerySpecs(pkgs)
- graph := parser.ParseDSLNodes(*dslDir, conf.GroupName, pkgs, graphlqQueries)
+ graph, nonNexusTypes, fileset := parser.ParseDSLNodes(*dslDir, conf.GroupName, pkgs, graphlqQueries)
  methods, codes := rest.ParseResponses(pkgs)
+ graphqlFiles := parser.ParseGraphQLFiles(*dslDir)
  if err = generator.RenderCRDTemplate(conf.GroupName, conf.CrdModulePath, pkgs, graph,
- *crdDir, methods, codes); err != nil {
+ *crdDir, methods, codes, nonNexusTypes, fileset, graphqlFiles); err != nil {
  log.Fatalf("Error rendering crd template: %v", err)
  }
 }

compiler/cmd/preparser/main.go

@@ -0,0 +1,49 @@
+package main
+
+import (
+ "flag"
+ "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/pkg/config"
+
+ log "github.com/sirupsen/logrus"
+ "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/pkg/preparser"
+)
+
+func main() {
+ configFile := flag.String("config-file", "", "Config file location.")
+ dslDir := flag.String("dsl", "datamodel", "DSL file location.")
+ outputDir := flag.String("output", "_generated", "output dir location.")
+ modPath := flag.String("modpath", "datamodel", "ModPath for rendered imports")
+ logLevel := flag.String("log-level", "ERROR", "Log level")
+ flag.Parse()
+
+ lvl, err := log.ParseLevel(*logLevel)
+ if err != nil {
+ log.Fatalf("Failed to configure logging: %v\n", err)
+ }
+ log.SetLevel(lvl)
+
+ conf := &config.Config{}
+ if *configFile != "" {
+ conf, err = config.LoadConfig(*configFile)
+ if err != nil {
+ log.Fatalf("Error loading config: %v", err)
+ }
+ }
+ config.ConfigInstance = conf
+ packages := preparser.Parse(*dslDir)
+ err = preparser.Render(*dslDir, packages)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ packages = preparser.Parse(*dslDir)
+ err = preparser.RenderImports(packages, *outputDir, *modPath)
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ err = preparser.CopyPkgsToBuild(packages, *outputDir)
+ if err != nil {
+ log.Fatal(err)
+ }
+}

compiler/example/datamodel/config/config.go

@@ -4,7 +4,7 @@ import (
  "net/http"
 
  "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/gns"
- "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/gns/service-group"
+ servicegroup "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/gns/service-group"
  py "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/policy"
  "github.com/vmware-tanzu/graph-framework-for-microservices/nexus/nexus"
 )

compiler/example/datamodel/config/gns/gns.go

@@ -4,6 +4,7 @@ import (
  "net/http"
 
  cartv1 "github.com/vmware-tanzu/cartographer/pkg/apis/v1alpha1"
+ "k8s.io/apimachinery/pkg/util/intstr"
 
  service_group "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/gns/service-group"
  policypkg "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/policy"
@@ -171,6 +172,8 @@ type Gns struct {
  //nexus-validation: Pattern=abc
  Domain string
  UseSharedGateway bool
+ Annotations string `nexus-graphql-jsonencoded:""`
+ TargetPort intstr.IntOrString `json:"targetPort,omitempty" mapstructure:"targetPort,omitempty"`
  Description Description
  GnsServiceGroups service_group.SvcGroup `nexus:"children"`
  GnsAccessControlPolicy policypkg.AccessControlPolicy `nexus:"child" nexus-graphql:"type:string"`

compiler/example/datamodel/config/policy/policy.go

@@ -1,7 +1,7 @@
 package policypkg
 
 import (
- "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/gns/service-group"
+ servicegroup "github.com/vmware-tanzu/graph-framework-for-microservices/compiler/example/datamodel/config/gns/service-group"
  "github.com/vmware-tanzu/graph-framework-for-microservices/nexus/nexus"
 )
 

compiler/example/output/_rendered_templates/nexus-gql/gqlgen.yml

@@ -68,6 +68,12 @@ models:
  fields:
  PolicyConfigs:
  resolver: true
+ policypkg_ACPConfig:
+ fields:
+ DestSvcGroups:
+ resolver: true
+ SourceSvcGroups:
+ resolver: true
  policypkg_VMpolicy:
  fields:
  queryGns1: