search greatness: enable search resolver generation (#44)

* get it clean Signed-off-by: Sarah Funkhouser <[email protected]> * generated against entx + gqlgen-plugin changes Signed-off-by: Sarah Funkhouser <[email protected]> * go mod entx Signed-off-by: Sarah Funkhouser <[email protected]> * regen Signed-off-by: Sarah Funkhouser <[email protected]> * fix gomod Signed-off-by: Sarah Funkhouser <[email protected]> * fix output Signed-off-by: Sarah Funkhouser <[email protected]> * fix output Signed-off-by: Sarah Funkhouser <[email protected]> * fix admin search Signed-off-by: Sarah Funkhouser <[email protected]> * update entx + gqlgen-plugin versions Signed-off-by: Sarah Funkhouser <[email protected]> * fix up search for json Signed-off-by: Sarah Funkhouser <[email protected]> * bump entx and gqlgen-plugins versions Signed-off-by: Sarah Funkhouser <[email protected]> * bk pipeline to use ghcr.io/theopenlane/build-image:latest Signed-off-by: Sarah Funkhouser <[email protected]> * GOFLAGS: -buildvcs=false Signed-off-by: Sarah Funkhouser <[email protected]> * use task commands in ci Signed-off-by: Sarah Funkhouser <[email protected]> * put that GOFLAGS: -buildvcs=false back Signed-off-by: Sarah Funkhouser <[email protected]> * fix build task command Signed-off-by: Sarah Funkhouser <[email protected]> --------- Signed-off-by: Sarah Funkhouser <[email protected]>
theopenlane · Sep 10, 2024 · 4176551 · 4176551
1 parent dabde8e
commit 4176551
Show file tree

Hide file tree

Showing 78 changed files with 18,549 additions and 2,658 deletions.
diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
@@ -14,7 +14,8 @@ steps:
         cancel_on_build_failing: true
         plugins:
           - docker#v5.11.0:
-              image: "ghcr.io/theopenlane/build-image:v0.1.2"
+              image: "ghcr.io/theopenlane/build-image:latest"
+              always_pull: true
               command: ["task", "ci"]
               environment:
                 - "GOTOOLCHAIN=auto"
@@ -23,7 +24,8 @@ steps:
         cancel_on_build_failing: true
         plugins:
           - docker#v5.11.0:
-              image: "ghcr.io/theopenlane/build-image:v0.1.2"
+              image: "ghcr.io/theopenlane/build-image:latest"
+              always_pull: true
               command: ["task", "config:ci"]
               environment:
                 - "GOTOOLCHAIN=auto"
@@ -35,8 +37,8 @@ steps:
         key: "lint"
         plugins:
           - docker#v5.11.0:
-              image: "golangci/golangci-lint:latest-alpine"
-              command: ["golangci-lint", "run", "-v", "--timeout", "10m", "--config", ".golangci.yaml", "--concurrency", "0"]
+              image: "ghcr.io/theopenlane/build-image:latest"
+              command: ["task", "go:lint"]
               always_pull: true
               environment:
                 - "GOTOOLCHAIN=auto"
@@ -51,8 +53,9 @@ steps:
           TEST_DB_URL: "libsql://file::memory:?cache=shared"
         plugins:
           - docker#v5.11.0:
-              image: golang:1.23.0
-              command: ["go", "test", "-coverprofile=coverage.out", "./..."]
+              image: ghcr.io/theopenlane/build-image:latest
+              always_pull: true
+              command: ["task", "go:test:cover"]
               environment:
                 - "TEST_DB_URL"
         artifact_paths: ["coverage.out"]
@@ -70,8 +73,9 @@ steps:
           - "sqlite://file:ent?mode=memory&cache=shared"
         plugins:
           - docker#v5.11.0:
-              image: golang:1.23.0
-              command: ["go", "test", "-coverprofile=coverage.out", "./..."]
+              image: ghcr.io/theopenlane/build-image:latest
+              always_pull: true
+              command: ["task", "go:test:cover"]
               environment:
                 - "TEST_DB_URL"
                 - "TEST_DB_CONTAINER_EXPIRY=8" # container expiry in minutes
@@ -93,7 +97,7 @@ steps:
         key: "gosec"
         plugins:
           - docker#v5.11.0:
-              image: "registry.hub.docker.com/securego/gosec:2.20.0"
+              image: "securego/gosec:2.20.0"
               command: ["-no-fail", "-exclude-generated", "-fmt sonarqube", "-out", "results.txt", "./..."]
               environment:
                 - "GOTOOLCHAIN=auto"
@@ -137,21 +141,23 @@ steps:
         artifact_paths: "bin/${APP_NAME}"
         plugins:
           - docker#v5.11.0:
-              image: "golang:1.23.0"
+              image: "ghcr.io/theopenlane/build-image:latest"
+              always_pull: true
               environment:
                 - CGO_ENABLED=0
                 - GOOS=linux
-              command: ["go", "build", "-buildvcs=false", "-mod=mod", "-a", "-o", "bin/$APP_NAME"]
+              command: ["task", "go:build:ci"]
       - label: ":terminal: build cli"
         key: "gobuild-cli"
-        artifact_paths: "bin/${APP_NAME}-cli"
+        artifact_paths: "bin/openlane-cli"
         plugins:
           - docker#v5.11.0:
-              image: "golang:1.23.0"
+              image: "ghcr.io/theopenlane/build-image:latest"
+              always_pull: true
               environment:
                 - GOOS=darwin
                 - GOARCH=arm64
-              command: ["go", "build", "-buildvcs=false", "-mod=mod", "-a", "-o", "bin/${APP_NAME}-cli", "./cmd/cli"]
+              command: ["task", "go:build-cli:ci"]
   - group: ":database: atlas migrate"
     key: "database"
     steps:

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -26,6 +26,7 @@ env:
   TEST_FGA_URL: "localhost:8080"
   ENV: config
   GODEBUG: gotypesalias=0 # remove once the backport fixes the types.Alias bug
+  GOFLAGS: -buildvcs=false
 
 tasks:
   default:
@@ -65,6 +66,12 @@ tasks:
     aliases: [cover]
     cmds:
       - go test -v ./... -coverprofile=coverage.out
+
+  go:test:coverout:
+    desc: runs and outputs results of created go tests with coverage
+    aliases: [cover]
+    cmds:
+      - task: go:test:cover
       - go tool cover -html=coverage.out
 
   go:fmt:
@@ -83,12 +90,22 @@ tasks:
     cmds:
       - go build -mod=mod -o core
 
+  go:build:ci:
+    desc: Runs go build for the core server
+    cmds:
+      - go build -mod=mod -a -o bin/core
+
   go:build-cli:
     aliases: [buildcli]
     desc: Runs go build for the openlane cli
     cmds:
       - go build -mod=mod -o openlane-cli ./cmd/cli
 
+  go:build-cli:ci:
+    desc: Runs go build for the openlane cli in CI
+    cmds:
+      - go build -mod=mod -a -o bin/openlane-cli ./cmd/cli
+
   go:all:
     aliases: [go]
     desc: Runs all go test and lint related tasks
@@ -138,10 +155,10 @@ tasks:
         fi
 
   clean:local:
-    desc: cleans up core.db and core-cli local
+    desc: cleans up core.db and openlane-cli local
     cmds:
       - "rm -f core.db"
-      - "rm -f core-cli"
+      - "rm -f openlane-cli"
       - task: buildcli
 
   shell:

diff --git a/cmd/cli/cmd/apitokens/root.go b/cmd/cli/cmd/apitokens/root.go
@@ -25,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the output in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/contact/create.go b/cmd/cli/cmd/contact/create.go
@@ -27,6 +27,7 @@ func init() {
 	createCmd.Flags().StringP("phone", "p", "", "phone number of the contact")
 	createCmd.Flags().StringP("title", "t", "", "title of the contact")
 	createCmd.Flags().StringP("company", "c", "", "company of the contact")
+	createCmd.Flags().StringSlice("tags", []string{}, "tags associated with the contact")
 }
 
 // createValidation validates the required fields for the command
@@ -57,6 +58,11 @@ func createValidation() (input openlaneclient.CreateContactInput, err error) {
 		input.Company = &company
 	}
 
+	tags := cmd.Config.Strings("tags")
+	if len(tags) > 0 {
+		input.Tags = tags
+	}
+
 	return input, nil
 }
 

diff --git a/cmd/cli/cmd/contact/root.go b/cmd/cli/cmd/contact/root.go
@@ -2,6 +2,7 @@ package contact
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the contacts in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/contacthistory/root.go b/cmd/cli/cmd/contacthistory/root.go
@@ -2,6 +2,7 @@ package contacthistory
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the contactHistories in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/documentdatahistory/root.go b/cmd/cli/cmd/documentdatahistory/root.go
@@ -2,6 +2,7 @@ package documentdatahistory
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the documentDataHistories in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitlementhistory/root.go b/cmd/cli/cmd/entitlementhistory/root.go
@@ -2,6 +2,7 @@ package entitlementhistory
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the entitlementHistories in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitlementplan/root.go b/cmd/cli/cmd/entitlementplan/root.go
@@ -2,6 +2,7 @@ package entitlementplan
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the plans in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the plans in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitlementplanfeaturehistory/root.go b/cmd/cli/cmd/entitlementplanfeaturehistory/root.go
@@ -2,6 +2,7 @@ package entitlementplanfeaturehistory
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the entitlementPlanFeatureHistories in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitlementplanfeatures/root.go b/cmd/cli/cmd/entitlementplanfeatures/root.go
@@ -2,6 +2,7 @@ package entitlementplanfeatures
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the planFeatures in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitlementplanhistory/root.go b/cmd/cli/cmd/entitlementplanhistory/root.go
@@ -2,6 +2,7 @@ package entitlementplanhistory
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the entitlementPlanHistories in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitlements/root.go b/cmd/cli/cmd/entitlements/root.go
@@ -2,6 +2,7 @@ package entitlement
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the output in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entity/create.go b/cmd/cli/cmd/entity/create.go
@@ -30,6 +30,7 @@ func init() {
 	createCmd.Flags().String("status", "", "status of the entity")
 	createCmd.Flags().StringSlice("domains", []string{}, "domains associated with the entity")
 	createCmd.Flags().String("note", "", "note about the entity")
+	createCmd.Flags().StringSlice("tags", []string{}, "tags associated with the entity")
 }
 
 // createValidation validates the required fields for the command
@@ -83,6 +84,11 @@ func createValidation(ctx context.Context) (input openlaneclient.CreateEntityInp
 		}
 	}
 
+	tags := cmd.Config.Strings("tags")
+	if len(tags) > 0 {
+		input.Tags = tags
+	}
+
 	return input, nil
 }
 

diff --git a/cmd/cli/cmd/entity/root.go b/cmd/cli/cmd/entity/root.go
@@ -25,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the entities in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entityhistory/root.go b/cmd/cli/cmd/entityhistory/root.go
@@ -2,6 +2,7 @@ package entityhistory
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the entityHistories in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}
 

diff --git a/cmd/cli/cmd/entitytype/root.go b/cmd/cli/cmd/entitytype/root.go
@@ -2,6 +2,7 @@ package entitytype
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -24,7 +25,7 @@ func init() {
 // consoleOutput prints the output in the console
 func consoleOutput(e any) error {
 	// check if the output format is JSON and print the entity types in JSON format
-	if cmd.OutputFormat == cmd.JSONOutput {
+	if strings.EqualFold(cmd.OutputFormat, cmd.JSONOutput) {
 		return jsonOutput(e)
 	}