From f33f9e0903325b51b2e890de7d562d513f42374f Mon Sep 17 00:00:00 2001 From: David Bloss Date: Thu, 10 Oct 2024 16:09:05 -0500 Subject: [PATCH 1/2] client.UpdateService needed v2 of ServiceUpdateInput --- src/common/client.go | 2 +- src/submodules/opslevel-go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/client.go b/src/common/client.go index 09054839..260a128e 100644 --- a/src/common/client.go +++ b/src/common/client.go @@ -104,7 +104,7 @@ func NewOpslevelClient(client *opslevel.Client) *OpslevelClient { return client.CreateService(input) }, UpdateServiceHandler: func(input opslevel.ServiceUpdateInput) (*opslevel.Service, error) { - return client.UpdateService(input) + return client.UpdateService(opslevel.ConvertServiceUpdateInput(input)) }, CreateAliasHandler: func(input opslevel.AliasCreateInput) error { _, err := client.CreateAlias(input) diff --git a/src/submodules/opslevel-go b/src/submodules/opslevel-go index f1283d61..5ca969f5 160000 --- a/src/submodules/opslevel-go +++ b/src/submodules/opslevel-go @@ -1 +1 @@ -Subproject commit f1283d6150ec3c85b7d00c7a8576bacb1c365f49 +Subproject commit 5ca969f5e42b4cd43b1d818080a2961874c59838 From 4ff1ba6019b0a22fae74581f8a51fa83baca994d Mon Sep 17 00:00:00 2001 From: Rocktavious Date: Fri, 11 Oct 2024 07:11:31 -0500 Subject: [PATCH 2/2] Cleanup task file --- Taskfile.yml | 23 ----------------------- src/submodules/opslevel-jq-parser | 2 +- src/submodules/opslevel-k8s-controller | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index a281ce0d..43cdabde 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -24,10 +24,8 @@ tasks: cmds: - task: install-gofumpt - task: install-golangci-lint - - task: install-nilaway - task: workspace - task: lint - - task: has-latest-opslevel-dependencies - task: test debug: @@ -49,7 +47,6 @@ tasks: cmds: - test -z "$(gofumpt -d -e . | tee /dev/stderr)" - golangci-lint run --timeout 5m - #- nilaway -include-pkgs='github.com/opslevel/kubectl-opslevel' -test=false ./... fix: desc: Fix formatting and linting @@ -69,7 +66,6 @@ tasks: - task: install-changie - task: install-gofumpt - task: install-golangci-lint - - task: install-nilaway - cmd: echo "Development tools installed!" silent: true - task: workspace @@ -99,18 +95,6 @@ tasks: - cmd: echo "submodules ready!" silent: true - has-latest-opslevel-dependencies: - desc: Check if opslevel dependencies are up to date in go.mod - dir: "{{.SRC_DIR}}" - silent: true - cmds: - - defer: { task: undo-ignore-go-work-files } - - task: tmp-ignore-go-work-file - - for: [ "{{.OPSLEVEL_GO_PKG}}", "{{.OPSLEVEL_JQ_PARSER_PKG}}", "{{.OPSLEVEL_K8S_CONTROLLER_PKG}}" ] - task: has-latest-opslevel-dep - vars: - OPSLEVEL_PKG: "{{.ITEM}}" - # internal (not directly called) tasks tmp-ignore-go-work-file: @@ -183,13 +167,6 @@ tasks: - task: go-install-tool vars: { GO_TOOL: "dlv", GO_TOOL_PATH: "github.com/go-delve/delve/cmd/dlv@latest" } - install-nilaway: - desc: go install "nilaway" - internal: true - cmds: - - task: go-install-tool - vars: { GO_TOOL: "nilaway", GO_TOOL_PATH: "go.uber.org/nilaway/cmd/nilaway@latest" } - install-gofumpt: desc: go install "gofumpt" internal: true diff --git a/src/submodules/opslevel-jq-parser b/src/submodules/opslevel-jq-parser index 3cea4833..3a197f31 160000 --- a/src/submodules/opslevel-jq-parser +++ b/src/submodules/opslevel-jq-parser @@ -1 +1 @@ -Subproject commit 3cea483309d6c733418039f5cb97d46f96e71837 +Subproject commit 3a197f31bc424ce1bfc2ebb36c4caf2d70a826c8 diff --git a/src/submodules/opslevel-k8s-controller b/src/submodules/opslevel-k8s-controller index 3da1300e..45e2c654 160000 --- a/src/submodules/opslevel-k8s-controller +++ b/src/submodules/opslevel-k8s-controller @@ -1 +1 @@ -Subproject commit 3da1300ecc82237ba6182f105c32837528e43b29 +Subproject commit 45e2c654546dc7a25c32ad81b05f1dd43c7f011d