diff --git a/.changelog/55.txt b/.changelog/55.txt new file mode 100644 index 000000000..a7a767acd --- /dev/null +++ b/.changelog/55.txt @@ -0,0 +1,3 @@ +```release-note:improvement +Foundation hardening: align Go 1.25, fix builtin protobuf registration conflicts, bump tier-3b dependencies, add govulncheck CI, and stabilize singleprocess tests +``` diff --git a/.github/scripts/verify_docker.sh b/.github/scripts/verify_docker.sh index ad97e9529..2f5f94006 100755 --- a/.github/scripts/verify_docker.sh +++ b/.github/scripts/verify_docker.sh @@ -32,12 +32,9 @@ function main { exit 1 fi - # Multiple builtin plugins register the same plugin.proto filename; warn instead of panic. - local proto_env=( -e GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn ) - - full_version=$(docker run --rm "${proto_env[@]}" "${image_name}" version) + full_version=$(docker run --rm "${image_name}" version) echo "Full version: ${full_version}" - got_version="$( awk '{print $2}' <(head -n1 <(docker run --rm "${proto_env[@]}" "${image_name}" version)) )" + got_version="$( awk '{print $2}' <(head -n1 <(docker run --rm "${image_name}" version)) )" if [[ "${got_version}" != "v${expect_version}" ]]; then echo "Version Test FAILED" echo "Got: ${got_version}, Want: v${expect_version}" diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index 7be6795b2..424923f94 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -103,5 +103,4 @@ jobs: DERRICK_ODRIMAGE: ${{ inputs.derrick-odr-image }} DERRICK_SERVERIMAGE_UPGRADE: ${{ needs.publish-images.outputs.derrick-image }} DERRICK_ODRIMAGE_UPGRADE: ${{ needs.publish-images.outputs.derrick-odr-image }} - GOLANG_PROTOBUF_REGISTRATION_CONFLICT: ignore run: ./test-e2e/run-test.sh diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 05a6b92f4..163afaee7 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -15,22 +15,16 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: go.mod + go-version-file: .go-version - name: Download go modules run: go mod download - name: Install golangci-lint - run: |- - download=https://raw.githubusercontent.com/golangci/golangci-lint/9a8a056e9fe49c0e9ed2287aedce1022c79a115b/install.sh # v1.52.2 - curl -sSf "$download" | sh -s v1.50.1 - - run: go mod download + run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6 - name: lint run: |- - ./bin/golangci-lint run --build-tags="$GOTAGS" -v --concurrency 2 \ - --disable-all \ - --timeout 10m \ - --enable gofmt \ - --enable gosimple \ - --enable govet + unformatted=$(git ls-files '*.go' | xargs gofmt -l -s) + test -z "$unformatted" + golangci-lint run --build-tags="$GOTAGS" ./... check-vendor: runs-on: ubuntu-latest @@ -38,7 +32,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: go.mod + go-version-file: .go-version - run: go mod tidy env: GOTOOLCHAIN: local @@ -56,7 +50,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: './go.mod' + go-version-file: './.go-version' - name: Split tests id: split-tests env: @@ -76,7 +70,6 @@ jobs: GOTESTSUM_RELEASE: 1.8.2 GOTAGS: '' GOMAXPROCS: 4 - GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - name: Start Services @@ -84,7 +77,7 @@ jobs: docker compose -f .github/services/go-tests/docker-compose.yml up --detach --no-color --wait - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: './go.mod' + go-version-file: './.go-version' - name: Install gotestsum run: |- url=https://github.com/gotestyourself/gotestsum/releases/download @@ -131,7 +124,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: './go.mod' + go-version-file: './.go-version' - run: |- go install github.com/kevinburke/go-bindata/... make bin @@ -143,10 +136,24 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: './go.mod' + go-version-file: './.go-version' - run: |- go install github.com/kevinburke/go-bindata/... make bin/windows + govulncheck: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 + with: + go-version-file: './.go-version' + - run: go mod download + - name: Install govulncheck + run: go install golang.org/x/vuln/cmd/govulncheck@latest + - name: Run govulncheck + continue-on-error: true # informational until deferred findings in docs/security/vuln-triage.md are resolved + run: govulncheck ./... + permissions: contents: read diff --git a/.github/workflows/integration-hcl.yml b/.github/workflows/integration-hcl.yml index 57bcb00c9..260cbce2e 100644 --- a/.github/workflows/integration-hcl.yml +++ b/.github/workflows/integration-hcl.yml @@ -5,13 +5,11 @@ on: jobs: generate-integration-hcl: runs-on: ubuntu-latest - env: - GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: go.mod + go-version-file: .go-version - name: Download go modules run: go mod download - run: make gen/integrations-hcl diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 198e5d163..8712e8582 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: go.mod + go-version-file: .go-version - name: Restore UI cache uses: actions/cache@v4 @@ -92,8 +92,6 @@ jobs: with: name: derrick.tar - name: Execute Integration Tests - env: - GOLANG_PROTOBUF_REGISTRATION_CONFLICT: warn run: |- tar -xvf derrick.tar ./ci/integration.sh diff --git a/.github/workflows/json-docs.yml b/.github/workflows/json-docs.yml index 4b3df1c33..32954f8f5 100644 --- a/.github/workflows/json-docs.yml +++ b/.github/workflows/json-docs.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0 with: - go-version-file: go.mod + go-version-file: .go-version - run: go mod download - uses: actions/download-artifact@v4 with: diff --git a/.go-version b/.go-version index 7bdcec52d..ad2191947 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.12 +1.25.0 diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 000000000..bbcb22cc7 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,11 @@ +version: "2" + +linters: + default: none + enable: + - govet + settings: + govet: + # lostcancel conflicts with the accept/reconnect loop in internal/runner. + disable: + - lostcancel diff --git a/CRT.Dockerfile b/CRT.Dockerfile index 69d6f93ec..4cb97dadc 100644 --- a/CRT.Dockerfile +++ b/CRT.Dockerfile @@ -52,8 +52,6 @@ USER derrick ENV USER derrick ENV HOME /home/derrick ENV XDG_RUNTIME_DIR=/run/user/100 -# Multiple builtin plugins register the same plugin.proto filename. -ENV GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn ENTRYPOINT ["/usr/bin/derrick"] @@ -91,7 +89,5 @@ RUN ["/kaniko/busybox", "--install", "-s", "/kaniko/bin"] # Need to add the dir with our tools in PATH ENV PATH $PATH:/kaniko/bin ENV TMPDIR /kaniko/tmp -# Multiple builtin plugins register the same plugin.proto filename. -ENV GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn ENTRYPOINT ["/kaniko/derrick"] diff --git a/builtin/aws/alb/plugin.pb.go b/builtin/aws/alb/alb.pb.go similarity index 66% rename from builtin/aws/alb/plugin.pb.go rename to builtin/aws/alb/alb.pb.go index b5e673c11..fd53415f5 100644 --- a/builtin/aws/alb/plugin.pb.go +++ b/builtin/aws/alb/alb.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: alb.proto package alb @@ -33,7 +33,7 @@ type TargetGroup struct { func (x *TargetGroup) Reset() { *x = TargetGroup{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_alb_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -46,7 +46,7 @@ func (x *TargetGroup) String() string { func (*TargetGroup) ProtoMessage() {} func (x *TargetGroup) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_alb_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -59,7 +59,7 @@ func (x *TargetGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use TargetGroup.ProtoReflect.Descriptor instead. func (*TargetGroup) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_alb_proto_rawDescGZIP(), []int{0} } func (x *TargetGroup) GetArn() string { @@ -91,7 +91,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_alb_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -104,7 +104,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_alb_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -117,7 +117,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_alb_proto_rawDescGZIP(), []int{1} } func (x *Release) GetUrl() string { @@ -165,7 +165,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_alb_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -178,7 +178,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_alb_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -191,7 +191,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2} + return file_alb_proto_rawDescGZIP(), []int{2} } type Resource_SecurityGroup struct { @@ -208,7 +208,7 @@ type Resource_SecurityGroup struct { func (x *Resource_SecurityGroup) Reset() { *x = Resource_SecurityGroup{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_alb_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -221,7 +221,7 @@ func (x *Resource_SecurityGroup) String() string { func (*Resource_SecurityGroup) ProtoMessage() {} func (x *Resource_SecurityGroup) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_alb_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -234,7 +234,7 @@ func (x *Resource_SecurityGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_SecurityGroup.ProtoReflect.Descriptor instead. func (*Resource_SecurityGroup) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 0} + return file_alb_proto_rawDescGZIP(), []int{2, 0} } func (x *Resource_SecurityGroup) GetId() string { @@ -264,7 +264,7 @@ type Resource_LoadBalancer struct { func (x *Resource_LoadBalancer) Reset() { *x = Resource_LoadBalancer{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_alb_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -277,7 +277,7 @@ func (x *Resource_LoadBalancer) String() string { func (*Resource_LoadBalancer) ProtoMessage() {} func (x *Resource_LoadBalancer) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_alb_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -290,7 +290,7 @@ func (x *Resource_LoadBalancer) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_LoadBalancer.ProtoReflect.Descriptor instead. func (*Resource_LoadBalancer) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 1} + return file_alb_proto_rawDescGZIP(), []int{2, 1} } func (x *Resource_LoadBalancer) GetArn() string { @@ -326,7 +326,7 @@ type Resource_Listener struct { func (x *Resource_Listener) Reset() { *x = Resource_Listener{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_alb_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -339,7 +339,7 @@ func (x *Resource_Listener) String() string { func (*Resource_Listener) ProtoMessage() {} func (x *Resource_Listener) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_alb_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -352,7 +352,7 @@ func (x *Resource_Listener) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Listener.ProtoReflect.Descriptor instead. func (*Resource_Listener) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 2} + return file_alb_proto_rawDescGZIP(), []int{2, 2} } func (x *Resource_Listener) GetArn() string { @@ -380,7 +380,7 @@ type Resource_RecordSet struct { func (x *Resource_RecordSet) Reset() { *x = Resource_RecordSet{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_alb_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -393,7 +393,7 @@ func (x *Resource_RecordSet) String() string { func (*Resource_RecordSet) ProtoMessage() {} func (x *Resource_RecordSet) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_alb_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -406,7 +406,7 @@ func (x *Resource_RecordSet) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_RecordSet.ProtoReflect.Descriptor instead. func (*Resource_RecordSet) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 3} + return file_alb_proto_rawDescGZIP(), []int{2, 3} } func (x *Resource_RecordSet) GetFQDN() string { @@ -416,63 +416,62 @@ func (x *Resource_RecordSet) GetFQDN() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, - 0x61, 0x6c, 0x62, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, - 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x37, 0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, - 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, - 0x6e, 0x22, 0xc0, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, - 0x2a, 0x0a, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, - 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, - 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x74, - 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x61, 0x72, 0x6e, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x41, 0x72, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, - 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, - 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x22, 0xf1, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x1a, 0x39, 0x0a, 0x0d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x54, 0x0a, 0x0c, - 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, - 0x61, 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x19, - 0x0a, 0x08, 0x64, 0x6e, 0x73, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x64, 0x6e, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, - 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, - 0x49, 0x64, 0x1a, 0x33, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x10, - 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, - 0x12, 0x15, 0x0a, 0x06, 0x74, 0x67, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x74, 0x67, 0x41, 0x72, 0x6e, 0x1a, 0x1f, 0x0a, 0x09, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x53, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x51, 0x44, 0x4e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x46, 0x51, 0x44, 0x4e, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, - 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, - 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x61, 0x6c, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, +var File_alb_proto protoreflect.FileDescriptor + +var file_alb_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x61, 0x6c, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x61, 0x6c, 0x62, + 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x37, 0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x22, 0xc0, + 0x01, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, + 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2a, 0x0a, 0x11, + 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x61, 0x72, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, + 0x61, 0x6e, 0x63, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x72, 0x67, + 0x65, 0x74, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, + 0x72, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, + 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x22, 0xf1, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x39, + 0x0a, 0x0d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x54, 0x0a, 0x0c, 0x4c, 0x6f, 0x61, + 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x64, + 0x6e, 0x73, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, + 0x6e, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x69, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49, 0x64, 0x1a, + 0x33, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x61, + 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x15, 0x0a, + 0x06, 0x74, 0x67, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, + 0x67, 0x41, 0x72, 0x6e, 0x1a, 0x1f, 0x0a, 0x09, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x65, + 0x74, 0x12, 0x12, 0x0a, 0x04, 0x46, 0x51, 0x44, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x46, 0x51, 0x44, 0x4e, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, + 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, + 0x77, 0x73, 0x2f, 0x61, 0x6c, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_alb_proto_rawDescOnce sync.Once + file_alb_proto_rawDescData = file_alb_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_alb_proto_rawDescGZIP() []byte { + file_alb_proto_rawDescOnce.Do(func() { + file_alb_proto_rawDescData = protoimpl.X.CompressGZIP(file_alb_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_alb_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_plugin_proto_goTypes = []interface{}{ +var file_alb_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_alb_proto_goTypes = []interface{}{ (*TargetGroup)(nil), // 0: alb.TargetGroup (*Release)(nil), // 1: alb.Release (*Resource)(nil), // 2: alb.Resource @@ -482,7 +481,7 @@ var file_plugin_proto_goTypes = []interface{}{ (*Resource_RecordSet)(nil), // 6: alb.Resource.RecordSet (*opaqueany.Any)(nil), // 7: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_alb_proto_depIdxs = []int32{ 7, // 0: alb.Release.resource_state:type_name -> opaqueany.Any 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -491,13 +490,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_alb_proto_init() } +func file_alb_proto_init() { + if File_alb_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TargetGroup); i { case 0: return &v.state @@ -509,7 +508,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -521,7 +520,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -533,7 +532,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_SecurityGroup); i { case 0: return &v.state @@ -545,7 +544,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_LoadBalancer); i { case 0: return &v.state @@ -557,7 +556,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Listener); i { case 0: return &v.state @@ -569,7 +568,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_alb_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_RecordSet); i { case 0: return &v.state @@ -586,18 +585,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_alb_proto_rawDesc, NumEnums: 0, NumMessages: 7, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_alb_proto_goTypes, + DependencyIndexes: file_alb_proto_depIdxs, + MessageInfos: file_alb_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_alb_proto = out.File + file_alb_proto_rawDesc = nil + file_alb_proto_goTypes = nil + file_alb_proto_depIdxs = nil } diff --git a/builtin/aws/alb/plugin.proto b/builtin/aws/alb/alb.proto similarity index 100% rename from builtin/aws/alb/plugin.proto rename to builtin/aws/alb/alb.proto diff --git a/builtin/aws/alb/main.go b/builtin/aws/alb/main.go index 439dcaa12..6bbcb86d7 100644 --- a/builtin/aws/alb/main.go +++ b/builtin/aws/alb/main.go @@ -4,7 +4,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. alb.proto // Options are the SDK options to use for instantiation. var Options = []sdk.Option{ diff --git a/builtin/aws/ami/plugin.pb.go b/builtin/aws/ami/ami.pb.go similarity index 53% rename from builtin/aws/ami/plugin.pb.go rename to builtin/aws/ami/ami.pb.go index 4ada20eeb..912cac392 100644 --- a/builtin/aws/ami/plugin.pb.go +++ b/builtin/aws/ami/ami.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: ami.proto package ami @@ -31,7 +31,7 @@ type Image struct { func (x *Image) Reset() { *x = Image{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ami_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -44,7 +44,7 @@ func (x *Image) String() string { func (*Image) ProtoMessage() {} func (x *Image) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ami_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -57,7 +57,7 @@ func (x *Image) ProtoReflect() protoreflect.Message { // Deprecated: Use Image.ProtoReflect.Descriptor instead. func (*Image) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_ami_proto_rawDescGZIP(), []int{0} } func (x *Image) GetImage() string { @@ -67,35 +67,35 @@ func (x *Image) GetImage() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor +var File_ami_proto protoreflect.FileDescriptor -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, - 0x61, 0x6d, 0x69, 0x22, 0x1d, 0x0a, 0x05, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, - 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, - 0x61, 0x6d, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_ami_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x61, 0x6d, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x61, 0x6d, 0x69, + 0x22, 0x1d, 0x0a, 0x05, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x42, + 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, + 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, + 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x61, 0x6d, 0x69, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_ami_proto_rawDescOnce sync.Once + file_ami_proto_rawDescData = file_ami_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_ami_proto_rawDescGZIP() []byte { + file_ami_proto_rawDescOnce.Do(func() { + file_ami_proto_rawDescData = protoimpl.X.CompressGZIP(file_ami_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_ami_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_ami_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_ami_proto_goTypes = []interface{}{ (*Image)(nil), // 0: ami.Image } -var file_plugin_proto_depIdxs = []int32{ +var file_ami_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -103,13 +103,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_ami_proto_init() } +func file_ami_proto_init() { + if File_ami_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ami_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Image); i { case 0: return &v.state @@ -126,18 +126,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_ami_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_ami_proto_goTypes, + DependencyIndexes: file_ami_proto_depIdxs, + MessageInfos: file_ami_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_ami_proto = out.File + file_ami_proto_rawDesc = nil + file_ami_proto_goTypes = nil + file_ami_proto_depIdxs = nil } diff --git a/builtin/aws/ami/plugin.proto b/builtin/aws/ami/ami.proto similarity index 100% rename from builtin/aws/ami/plugin.proto rename to builtin/aws/ami/ami.proto diff --git a/builtin/aws/ami/main.go b/builtin/aws/ami/main.go index 10814d9c8..e201fecbe 100644 --- a/builtin/aws/ami/main.go +++ b/builtin/aws/ami/main.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. ami.proto // Options are the SDK options to use for instantiation. var Options = []sdk.Option{ diff --git a/builtin/aws/ec2/plugin.pb.go b/builtin/aws/ec2/ec2.pb.go similarity index 53% rename from builtin/aws/ec2/plugin.pb.go rename to builtin/aws/ec2/ec2.pb.go index 1f55cfcc1..99d6e0248 100644 --- a/builtin/aws/ec2/plugin.pb.go +++ b/builtin/aws/ec2/ec2.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: ec2.proto package ec2 @@ -35,7 +35,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ec2_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -48,7 +48,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ec2_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -61,7 +61,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_ec2_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetServiceName() string { @@ -99,44 +99,44 @@ func (x *Deployment) GetTargetGroupArn() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, - 0x65, 0x63, 0x32, 0x22, 0xad, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, - 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, - 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x49, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, - 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x64, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x44, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x41, 0x72, 0x6e, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, - 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, 0x77, 0x73, - 0x2f, 0x65, 0x63, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_ec2_proto protoreflect.FileDescriptor + +var file_ec2_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x65, 0x63, 0x32, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x65, 0x63, 0x32, + 0x22, 0xad, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, + 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x70, 0x75, + 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, + 0x75, 0x62, 0x6c, 0x69, 0x63, 0x49, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, + 0x63, 0x5f, 0x64, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x75, 0x62, + 0x6c, 0x69, 0x63, 0x44, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x72, 0x6e, + 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, + 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, + 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x65, 0x63, + 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_ec2_proto_rawDescOnce sync.Once + file_ec2_proto_rawDescData = file_ec2_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_ec2_proto_rawDescGZIP() []byte { + file_ec2_proto_rawDescOnce.Do(func() { + file_ec2_proto_rawDescData = protoimpl.X.CompressGZIP(file_ec2_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_ec2_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_ec2_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_ec2_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: ec2.Deployment } -var file_plugin_proto_depIdxs = []int32{ +var file_ec2_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -144,13 +144,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_ec2_proto_init() } +func file_ec2_proto_init() { + if File_ec2_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ec2_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -167,18 +167,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_ec2_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_ec2_proto_goTypes, + DependencyIndexes: file_ec2_proto_depIdxs, + MessageInfos: file_ec2_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_ec2_proto = out.File + file_ec2_proto_rawDesc = nil + file_ec2_proto_goTypes = nil + file_ec2_proto_depIdxs = nil } diff --git a/builtin/aws/ec2/plugin.proto b/builtin/aws/ec2/ec2.proto similarity index 100% rename from builtin/aws/ec2/plugin.proto rename to builtin/aws/ec2/ec2.proto diff --git a/builtin/aws/ec2/main.go b/builtin/aws/ec2/main.go index 4b5d6c9d8..fc82551d8 100644 --- a/builtin/aws/ec2/main.go +++ b/builtin/aws/ec2/main.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. ec2.proto // Options are the SDK options to use for instantiation. var Options = []sdk.Option{ diff --git a/builtin/aws/ecr/ecr.go b/builtin/aws/ecr/ecr.go index a58f8f19b..dde518d93 100644 --- a/builtin/aws/ecr/ecr.go +++ b/builtin/aws/ecr/ecr.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. ecr.proto // Options are the SDK options to use for instantiation. var Options = []sdk.Option{ diff --git a/builtin/aws/ecr/plugin.pb.go b/builtin/aws/ecr/ecr.pb.go similarity index 54% rename from builtin/aws/ecr/plugin.pb.go rename to builtin/aws/ecr/ecr.pb.go index e2cd27601..6fa473126 100644 --- a/builtin/aws/ecr/plugin.pb.go +++ b/builtin/aws/ecr/ecr.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: ecr.proto package ecr @@ -34,7 +34,7 @@ type Image struct { func (x *Image) Reset() { *x = Image{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ecr_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -47,7 +47,7 @@ func (x *Image) String() string { func (*Image) ProtoMessage() {} func (x *Image) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ecr_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -60,7 +60,7 @@ func (x *Image) ProtoReflect() protoreflect.Message { // Deprecated: Use Image.ProtoReflect.Descriptor instead. func (*Image) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_ecr_proto_rawDescGZIP(), []int{0} } func (x *Image) GetImage() string { @@ -84,39 +84,38 @@ func (x *Image) GetArchitecture() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, - 0x65, 0x63, 0x72, 0x22, 0x53, 0x0a, 0x05, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x74, 0x61, 0x67, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, - 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x72, 0x63, 0x68, - 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, - 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, - 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x65, 0x63, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, +var File_ecr_proto protoreflect.FileDescriptor + +var file_ecr_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x65, 0x63, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x65, 0x63, 0x72, + 0x22, 0x53, 0x0a, 0x05, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, + 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, + 0x67, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, + 0x63, 0x74, 0x75, 0x72, 0x65, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, + 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, + 0x77, 0x73, 0x2f, 0x65, 0x63, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_ecr_proto_rawDescOnce sync.Once + file_ecr_proto_rawDescData = file_ecr_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_ecr_proto_rawDescGZIP() []byte { + file_ecr_proto_rawDescOnce.Do(func() { + file_ecr_proto_rawDescData = protoimpl.X.CompressGZIP(file_ecr_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_ecr_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_ecr_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_ecr_proto_goTypes = []interface{}{ (*Image)(nil), // 0: ecr.Image } -var file_plugin_proto_depIdxs = []int32{ +var file_ecr_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -124,13 +123,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_ecr_proto_init() } +func file_ecr_proto_init() { + if File_ecr_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ecr_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Image); i { case 0: return &v.state @@ -147,18 +146,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_ecr_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_ecr_proto_goTypes, + DependencyIndexes: file_ecr_proto_depIdxs, + MessageInfos: file_ecr_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_ecr_proto = out.File + file_ecr_proto_rawDesc = nil + file_ecr_proto_goTypes = nil + file_ecr_proto_depIdxs = nil } diff --git a/builtin/aws/ecr/plugin.proto b/builtin/aws/ecr/ecr.proto similarity index 100% rename from builtin/aws/ecr/plugin.proto rename to builtin/aws/ecr/ecr.proto diff --git a/builtin/aws/ecs/plugin.pb.go b/builtin/aws/ecs/ecs.pb.go similarity index 71% rename from builtin/aws/ecs/plugin.pb.go rename to builtin/aws/ecs/ecs.pb.go index 78f871154..938f4ecd8 100644 --- a/builtin/aws/ecs/plugin.pb.go +++ b/builtin/aws/ecs/ecs.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: ecs.proto package ecs @@ -39,7 +39,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ecs_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -52,7 +52,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_ecs_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -65,7 +65,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_ecs_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetUrl() string { @@ -136,7 +136,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_ecs_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -149,7 +149,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_ecs_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -162,7 +162,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_ecs_proto_rawDescGZIP(), []int{1} } func (x *Release) GetUrl() string { @@ -189,7 +189,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_ecs_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -202,7 +202,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_ecs_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -215,7 +215,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2} + return file_ecs_proto_rawDescGZIP(), []int{2} } // This represents the state of the TaskLaunch implementation. @@ -230,7 +230,7 @@ type TaskInfo struct { func (x *TaskInfo) Reset() { *x = TaskInfo{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_ecs_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -243,7 +243,7 @@ func (x *TaskInfo) String() string { func (*TaskInfo) ProtoMessage() {} func (x *TaskInfo) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_ecs_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -256,7 +256,7 @@ func (x *TaskInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskInfo.ProtoReflect.Descriptor instead. func (*TaskInfo) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{3} + return file_ecs_proto_rawDescGZIP(), []int{3} } func (x *TaskInfo) GetId() string { @@ -278,7 +278,7 @@ type Resource_Cluster struct { func (x *Resource_Cluster) Reset() { *x = Resource_Cluster{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_ecs_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -291,7 +291,7 @@ func (x *Resource_Cluster) String() string { func (*Resource_Cluster) ProtoMessage() {} func (x *Resource_Cluster) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_ecs_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -304,7 +304,7 @@ func (x *Resource_Cluster) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Cluster.ProtoReflect.Descriptor instead. func (*Resource_Cluster) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 0} + return file_ecs_proto_rawDescGZIP(), []int{2, 0} } func (x *Resource_Cluster) GetName() string { @@ -335,7 +335,7 @@ type Resource_ExecutionRole struct { func (x *Resource_ExecutionRole) Reset() { *x = Resource_ExecutionRole{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_ecs_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -348,7 +348,7 @@ func (x *Resource_ExecutionRole) String() string { func (*Resource_ExecutionRole) ProtoMessage() {} func (x *Resource_ExecutionRole) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_ecs_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -361,7 +361,7 @@ func (x *Resource_ExecutionRole) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_ExecutionRole.ProtoReflect.Descriptor instead. func (*Resource_ExecutionRole) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 1} + return file_ecs_proto_rawDescGZIP(), []int{2, 1} } func (x *Resource_ExecutionRole) GetName() string { @@ -399,7 +399,7 @@ type Resource_TaskRole struct { func (x *Resource_TaskRole) Reset() { *x = Resource_TaskRole{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_ecs_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -412,7 +412,7 @@ func (x *Resource_TaskRole) String() string { func (*Resource_TaskRole) ProtoMessage() {} func (x *Resource_TaskRole) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_ecs_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -425,7 +425,7 @@ func (x *Resource_TaskRole) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_TaskRole.ProtoReflect.Descriptor instead. func (*Resource_TaskRole) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 2} + return file_ecs_proto_rawDescGZIP(), []int{2, 2} } func (x *Resource_TaskRole) GetName() string { @@ -462,7 +462,7 @@ type Resource_Service struct { func (x *Resource_Service) Reset() { *x = Resource_Service{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[7] + mi := &file_ecs_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -475,7 +475,7 @@ func (x *Resource_Service) String() string { func (*Resource_Service) ProtoMessage() {} func (x *Resource_Service) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[7] + mi := &file_ecs_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -488,7 +488,7 @@ func (x *Resource_Service) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Service.ProtoReflect.Descriptor instead. func (*Resource_Service) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 3} + return file_ecs_proto_rawDescGZIP(), []int{2, 3} } func (x *Resource_Service) GetName() string { @@ -525,7 +525,7 @@ type Resource_TargetGroup struct { func (x *Resource_TargetGroup) Reset() { *x = Resource_TargetGroup{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[8] + mi := &file_ecs_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -538,7 +538,7 @@ func (x *Resource_TargetGroup) String() string { func (*Resource_TargetGroup) ProtoMessage() {} func (x *Resource_TargetGroup) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[8] + mi := &file_ecs_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -551,7 +551,7 @@ func (x *Resource_TargetGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_TargetGroup.ProtoReflect.Descriptor instead. func (*Resource_TargetGroup) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 4} + return file_ecs_proto_rawDescGZIP(), []int{2, 4} } func (x *Resource_TargetGroup) GetName() string { @@ -587,7 +587,7 @@ type Resource_LogGroup struct { func (x *Resource_LogGroup) Reset() { *x = Resource_LogGroup{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[9] + mi := &file_ecs_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -600,7 +600,7 @@ func (x *Resource_LogGroup) String() string { func (*Resource_LogGroup) ProtoMessage() {} func (x *Resource_LogGroup) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[9] + mi := &file_ecs_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -613,7 +613,7 @@ func (x *Resource_LogGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_LogGroup.ProtoReflect.Descriptor instead. func (*Resource_LogGroup) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 5} + return file_ecs_proto_rawDescGZIP(), []int{2, 5} } func (x *Resource_LogGroup) GetName() string { @@ -644,7 +644,7 @@ type Resource_SecurityGroup struct { func (x *Resource_SecurityGroup) Reset() { *x = Resource_SecurityGroup{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[10] + mi := &file_ecs_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -657,7 +657,7 @@ func (x *Resource_SecurityGroup) String() string { func (*Resource_SecurityGroup) ProtoMessage() {} func (x *Resource_SecurityGroup) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[10] + mi := &file_ecs_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -670,7 +670,7 @@ func (x *Resource_SecurityGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_SecurityGroup.ProtoReflect.Descriptor instead. func (*Resource_SecurityGroup) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 6} + return file_ecs_proto_rawDescGZIP(), []int{2, 6} } func (x *Resource_SecurityGroup) GetName() string { @@ -706,7 +706,7 @@ type Resource_InternalSecurityGroups struct { func (x *Resource_InternalSecurityGroups) Reset() { *x = Resource_InternalSecurityGroups{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[11] + mi := &file_ecs_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -719,7 +719,7 @@ func (x *Resource_InternalSecurityGroups) String() string { func (*Resource_InternalSecurityGroups) ProtoMessage() {} func (x *Resource_InternalSecurityGroups) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[11] + mi := &file_ecs_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -732,7 +732,7 @@ func (x *Resource_InternalSecurityGroups) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_InternalSecurityGroups.ProtoReflect.Descriptor instead. func (*Resource_InternalSecurityGroups) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 7} + return file_ecs_proto_rawDescGZIP(), []int{2, 7} } func (x *Resource_InternalSecurityGroups) GetSecurityGroups() []*Resource_SecurityGroup { @@ -754,7 +754,7 @@ type Resource_ExternalSecurityGroups struct { func (x *Resource_ExternalSecurityGroups) Reset() { *x = Resource_ExternalSecurityGroups{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[12] + mi := &file_ecs_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -767,7 +767,7 @@ func (x *Resource_ExternalSecurityGroups) String() string { func (*Resource_ExternalSecurityGroups) ProtoMessage() {} func (x *Resource_ExternalSecurityGroups) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[12] + mi := &file_ecs_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -780,7 +780,7 @@ func (x *Resource_ExternalSecurityGroups) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_ExternalSecurityGroups.ProtoReflect.Descriptor instead. func (*Resource_ExternalSecurityGroups) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 8} + return file_ecs_proto_rawDescGZIP(), []int{2, 8} } func (x *Resource_ExternalSecurityGroups) GetSecurityGroups() []*Resource_SecurityGroup { @@ -802,7 +802,7 @@ type Resource_AlbSubnets struct { func (x *Resource_AlbSubnets) Reset() { *x = Resource_AlbSubnets{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[13] + mi := &file_ecs_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -815,7 +815,7 @@ func (x *Resource_AlbSubnets) String() string { func (*Resource_AlbSubnets) ProtoMessage() {} func (x *Resource_AlbSubnets) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[13] + mi := &file_ecs_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -828,7 +828,7 @@ func (x *Resource_AlbSubnets) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_AlbSubnets.ProtoReflect.Descriptor instead. func (*Resource_AlbSubnets) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 9} + return file_ecs_proto_rawDescGZIP(), []int{2, 9} } func (x *Resource_AlbSubnets) GetSubnets() *Resource_Subnets { @@ -850,7 +850,7 @@ type Resource_ServiceSubnets struct { func (x *Resource_ServiceSubnets) Reset() { *x = Resource_ServiceSubnets{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[14] + mi := &file_ecs_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -863,7 +863,7 @@ func (x *Resource_ServiceSubnets) String() string { func (*Resource_ServiceSubnets) ProtoMessage() {} func (x *Resource_ServiceSubnets) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[14] + mi := &file_ecs_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -876,7 +876,7 @@ func (x *Resource_ServiceSubnets) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_ServiceSubnets.ProtoReflect.Descriptor instead. func (*Resource_ServiceSubnets) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 10} + return file_ecs_proto_rawDescGZIP(), []int{2, 10} } func (x *Resource_ServiceSubnets) GetSubnets() *Resource_Subnets { @@ -900,7 +900,7 @@ type Resource_Subnets struct { func (x *Resource_Subnets) Reset() { *x = Resource_Subnets{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[15] + mi := &file_ecs_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -913,7 +913,7 @@ func (x *Resource_Subnets) String() string { func (*Resource_Subnets) ProtoMessage() {} func (x *Resource_Subnets) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[15] + mi := &file_ecs_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -926,7 +926,7 @@ func (x *Resource_Subnets) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Subnets.ProtoReflect.Descriptor instead. func (*Resource_Subnets) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 11} + return file_ecs_proto_rawDescGZIP(), []int{2, 11} } func (x *Resource_Subnets) GetSubnets() []*Resource_Subnets_Subnet { @@ -959,7 +959,7 @@ type Resource_Alb struct { func (x *Resource_Alb) Reset() { *x = Resource_Alb{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[16] + mi := &file_ecs_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -972,7 +972,7 @@ func (x *Resource_Alb) String() string { func (*Resource_Alb) ProtoMessage() {} func (x *Resource_Alb) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[16] + mi := &file_ecs_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -985,7 +985,7 @@ func (x *Resource_Alb) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Alb.ProtoReflect.Descriptor instead. func (*Resource_Alb) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 12} + return file_ecs_proto_rawDescGZIP(), []int{2, 12} } func (x *Resource_Alb) GetName() string { @@ -1035,7 +1035,7 @@ type Resource_TaskDefinition struct { func (x *Resource_TaskDefinition) Reset() { *x = Resource_TaskDefinition{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[17] + mi := &file_ecs_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1048,7 +1048,7 @@ func (x *Resource_TaskDefinition) String() string { func (*Resource_TaskDefinition) ProtoMessage() {} func (x *Resource_TaskDefinition) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[17] + mi := &file_ecs_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1061,7 +1061,7 @@ func (x *Resource_TaskDefinition) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_TaskDefinition.ProtoReflect.Descriptor instead. func (*Resource_TaskDefinition) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 13} + return file_ecs_proto_rawDescGZIP(), []int{2, 13} } func (x *Resource_TaskDefinition) GetArn() string { @@ -1090,7 +1090,7 @@ type Resource_Route53Record struct { func (x *Resource_Route53Record) Reset() { *x = Resource_Route53Record{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[18] + mi := &file_ecs_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1103,7 +1103,7 @@ func (x *Resource_Route53Record) String() string { func (*Resource_Route53Record) ProtoMessage() {} func (x *Resource_Route53Record) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[18] + mi := &file_ecs_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1116,7 +1116,7 @@ func (x *Resource_Route53Record) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Route53Record.ProtoReflect.Descriptor instead. func (*Resource_Route53Record) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 14} + return file_ecs_proto_rawDescGZIP(), []int{2, 14} } func (x *Resource_Route53Record) GetName() string { @@ -1144,7 +1144,7 @@ type Resource_Subnets_Subnet struct { func (x *Resource_Subnets_Subnet) Reset() { *x = Resource_Subnets_Subnet{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[19] + mi := &file_ecs_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1157,7 +1157,7 @@ func (x *Resource_Subnets_Subnet) String() string { func (*Resource_Subnets_Subnet) ProtoMessage() {} func (x *Resource_Subnets_Subnet) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[19] + mi := &file_ecs_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1170,7 +1170,7 @@ func (x *Resource_Subnets_Subnet) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Subnets_Subnet.ProtoReflect.Descriptor instead. func (*Resource_Subnets_Subnet) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 11, 0} + return file_ecs_proto_rawDescGZIP(), []int{2, 11, 0} } func (x *Resource_Subnets_Subnet) GetId() string { @@ -1194,7 +1194,7 @@ type Resource_Alb_Listener struct { func (x *Resource_Alb_Listener) Reset() { *x = Resource_Alb_Listener{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[20] + mi := &file_ecs_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1207,7 +1207,7 @@ func (x *Resource_Alb_Listener) String() string { func (*Resource_Alb_Listener) ProtoMessage() {} func (x *Resource_Alb_Listener) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[20] + mi := &file_ecs_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1220,7 +1220,7 @@ func (x *Resource_Alb_Listener) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Alb_Listener.ProtoReflect.Descriptor instead. func (*Resource_Alb_Listener) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 12, 0} + return file_ecs_proto_rawDescGZIP(), []int{2, 12, 0} } func (x *Resource_Alb_Listener) GetArn() string { @@ -1244,140 +1244,139 @@ func (x *Resource_Alb_Listener) GetManaged() bool { return false } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, - 0x65, 0x63, 0x73, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, - 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x02, 0x0a, 0x0a, 0x44, 0x65, 0x70, - 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x61, 0x73, - 0x6b, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x61, 0x73, - 0x6b, 0x41, 0x72, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, - 0x61, 0x72, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x41, 0x72, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0e, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x72, 0x6e, 0x12, - 0x2a, 0x0a, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, - 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, - 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x6c, - 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x18, - 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, - 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, - 0x47, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, - 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2a, 0x0a, 0x11, +var File_ecs_proto protoreflect.FileDescriptor + +var file_ecs_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x65, 0x63, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x65, 0x63, 0x73, + 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x02, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, + 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61, + 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x72, + 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x61, 0x72, 0x6e, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, + 0x72, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x61, + 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x41, 0x72, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x61, 0x72, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, - 0x61, 0x6e, 0x63, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x22, 0xb1, 0x0a, 0x0a, 0x08, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x2f, 0x0a, 0x07, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x1a, 0x4f, 0x0a, 0x0d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, - 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x18, 0x0a, - 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, - 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x4a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x52, - 0x6f, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, - 0x61, 0x67, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, - 0x67, 0x65, 0x64, 0x1a, 0x49, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x61, 0x72, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0x47, - 0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, + 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, + 0x61, 0x6e, 0x63, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x6c, 0x69, 0x73, 0x74, + 0x65, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, + 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, + 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, + 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, + 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x47, 0x0a, 0x07, + 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x2a, 0x0a, 0x11, 0x6c, 0x6f, 0x61, + 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, + 0x65, 0x72, 0x41, 0x72, 0x6e, 0x22, 0xb1, 0x0a, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x1a, 0x2f, 0x0a, 0x07, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x61, 0x72, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x1a, 0x30, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x1a, 0x4d, 0x0a, 0x0d, 0x53, 0x65, 0x63, - 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, - 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x5e, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x73, 0x12, 0x44, 0x0a, 0x0f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x63, - 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, - 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, - 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x5e, 0x0a, 0x16, 0x45, 0x78, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x73, 0x12, 0x44, 0x0a, 0x0f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x63, - 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, - 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, - 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x3d, 0x0a, 0x0a, 0x41, 0x6c, 0x62, 0x53, + 0x61, 0x72, 0x6e, 0x1a, 0x4f, 0x0a, 0x0d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, + 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, + 0x61, 0x67, 0x65, 0x64, 0x1a, 0x4a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x6f, 0x6c, 0x65, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, + 0x1a, 0x49, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, + 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x1a, 0x47, 0x0a, 0x0b, 0x54, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, + 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, + 0x70, 0x6f, 0x72, 0x74, 0x1a, 0x30, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x1a, 0x4d, 0x0a, 0x0d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, + 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, + 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, + 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x5e, 0x0a, 0x16, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, + 0x44, 0x0a, 0x0f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x5e, 0x0a, 0x16, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x12, + 0x44, 0x0a, 0x0f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x3d, 0x0a, 0x0a, 0x41, 0x6c, 0x62, 0x53, 0x75, 0x62, 0x6e, + 0x65, 0x74, 0x73, 0x12, 0x2f, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x52, 0x07, 0x73, 0x75, 0x62, + 0x6e, 0x65, 0x74, 0x73, 0x1a, 0x41, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x12, 0x2f, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x52, 0x07, - 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x1a, 0x41, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x12, 0x2f, 0x0a, 0x07, 0x73, 0x75, 0x62, - 0x6e, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x63, 0x73, - 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, - 0x73, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x1a, 0x72, 0x0a, 0x07, 0x53, 0x75, - 0x62, 0x6e, 0x65, 0x74, 0x73, 0x12, 0x36, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x2e, 0x53, 0x75, - 0x62, 0x6e, 0x65, 0x74, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x12, 0x15, 0x0a, - 0x06, 0x76, 0x70, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, - 0x70, 0x63, 0x49, 0x64, 0x1a, 0x18, 0x0a, 0x06, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x1a, 0x8f, - 0x02, 0x0a, 0x03, 0x41, 0x6c, 0x62, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x19, 0x0a, 0x08, - 0x64, 0x6e, 0x73, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x64, 0x6e, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x63, 0x61, 0x6e, 0x6f, 0x6e, - 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, - 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x61, 0x6e, 0x6f, 0x6e, - 0x69, 0x63, 0x61, 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x65, 0x64, 0x5a, 0x6f, 0x6e, 0x65, 0x49, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x74, 0x0a, 0x08, 0x4c, 0x69, - 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x3c, 0x0a, 0x0c, 0x74, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, - 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x61, - 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, - 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, - 0x1a, 0x3c, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x61, 0x72, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3c, - 0x0a, 0x0d, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x35, 0x33, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49, 0x64, 0x22, 0x1a, 0x0a, 0x08, - 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, - 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, - 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x65, 0x63, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x1a, 0x72, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x6e, 0x65, + 0x74, 0x73, 0x12, 0x36, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x63, 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x2e, 0x53, 0x75, 0x62, 0x6e, 0x65, + 0x74, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x76, 0x70, + 0x63, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x70, 0x63, 0x49, + 0x64, 0x1a, 0x18, 0x0a, 0x06, 0x53, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x1a, 0x8f, 0x02, 0x0a, 0x03, + 0x41, 0x6c, 0x62, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x6e, 0x73, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6e, 0x73, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, + 0x6c, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x69, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, + 0x6c, 0x48, 0x6f, 0x73, 0x74, 0x65, 0x64, 0x5a, 0x6f, 0x6e, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, + 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x74, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x65, + 0x6e, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x61, 0x72, 0x6e, 0x12, 0x3c, 0x0a, 0x0c, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x65, 0x63, + 0x73, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x54, 0x61, 0x72, 0x67, 0x65, + 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0b, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x1a, 0x3c, 0x0a, + 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x10, 0x0a, 0x03, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x61, 0x72, + 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3c, 0x0a, 0x0d, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x35, 0x33, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x12, 0x17, 0x0a, 0x07, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x7a, 0x6f, 0x6e, 0x65, 0x49, 0x64, 0x22, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, + 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, + 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, + 0x77, 0x73, 0x2f, 0x65, 0x63, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_ecs_proto_rawDescOnce sync.Once + file_ecs_proto_rawDescData = file_ecs_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_ecs_proto_rawDescGZIP() []byte { + file_ecs_proto_rawDescOnce.Do(func() { + file_ecs_proto_rawDescData = protoimpl.X.CompressGZIP(file_ecs_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_ecs_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 21) -var file_plugin_proto_goTypes = []interface{}{ +var file_ecs_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_ecs_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: ecs.Deployment (*Release)(nil), // 1: ecs.Release (*Resource)(nil), // 2: ecs.Resource @@ -1401,7 +1400,7 @@ var file_plugin_proto_goTypes = []interface{}{ (*Resource_Alb_Listener)(nil), // 20: ecs.Resource.Alb.Listener (*opaqueany.Any)(nil), // 21: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_ecs_proto_depIdxs = []int32{ 21, // 0: ecs.Deployment.resource_state:type_name -> opaqueany.Any 10, // 1: ecs.Resource.InternalSecurityGroups.security_groups:type_name -> ecs.Resource.SecurityGroup 10, // 2: ecs.Resource.ExternalSecurityGroups.security_groups:type_name -> ecs.Resource.SecurityGroup @@ -1416,13 +1415,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:7] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_ecs_proto_init() } +func file_ecs_proto_init() { + if File_ecs_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -1434,7 +1433,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -1446,7 +1445,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -1458,7 +1457,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskInfo); i { case 0: return &v.state @@ -1470,7 +1469,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Cluster); i { case 0: return &v.state @@ -1482,7 +1481,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_ExecutionRole); i { case 0: return &v.state @@ -1494,7 +1493,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_TaskRole); i { case 0: return &v.state @@ -1506,7 +1505,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Service); i { case 0: return &v.state @@ -1518,7 +1517,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_TargetGroup); i { case 0: return &v.state @@ -1530,7 +1529,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_LogGroup); i { case 0: return &v.state @@ -1542,7 +1541,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_SecurityGroup); i { case 0: return &v.state @@ -1554,7 +1553,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_InternalSecurityGroups); i { case 0: return &v.state @@ -1566,7 +1565,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_ExternalSecurityGroups); i { case 0: return &v.state @@ -1578,7 +1577,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_AlbSubnets); i { case 0: return &v.state @@ -1590,7 +1589,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_ServiceSubnets); i { case 0: return &v.state @@ -1602,7 +1601,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Subnets); i { case 0: return &v.state @@ -1614,7 +1613,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Alb); i { case 0: return &v.state @@ -1626,7 +1625,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_TaskDefinition); i { case 0: return &v.state @@ -1638,7 +1637,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Route53Record); i { case 0: return &v.state @@ -1650,7 +1649,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Subnets_Subnet); i { case 0: return &v.state @@ -1662,7 +1661,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_ecs_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Alb_Listener); i { case 0: return &v.state @@ -1679,18 +1678,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_ecs_proto_rawDesc, NumEnums: 0, NumMessages: 21, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_ecs_proto_goTypes, + DependencyIndexes: file_ecs_proto_depIdxs, + MessageInfos: file_ecs_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_ecs_proto = out.File + file_ecs_proto_rawDesc = nil + file_ecs_proto_goTypes = nil + file_ecs_proto_depIdxs = nil } diff --git a/builtin/aws/ecs/plugin.proto b/builtin/aws/ecs/ecs.proto similarity index 100% rename from builtin/aws/ecs/plugin.proto rename to builtin/aws/ecs/ecs.proto diff --git a/builtin/aws/ecs/main.go b/builtin/aws/ecs/main.go index 80d75a67b..6ed420e90 100644 --- a/builtin/aws/ecs/main.go +++ b/builtin/aws/ecs/main.go @@ -4,7 +4,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. ecs.proto const platformName = "aws-ecs" diff --git a/builtin/aws/ecs/platform.go b/builtin/aws/ecs/platform.go index 3416268cc..57fbd63fe 100644 --- a/builtin/aws/ecs/platform.go +++ b/builtin/aws/ecs/platform.go @@ -1347,7 +1347,7 @@ func (p *Platform) resourceTargetGroupCreate( } if *createTargetGroupInput.HealthCheckIntervalSeconds < *createTargetGroupInput.HealthCheckTimeoutSeconds { - return status.Errorf(codes.InvalidArgument, fmt.Sprintf("Health check interval cannot be shorter than the timeout")) + return status.Errorf(codes.InvalidArgument, "Health check interval cannot be shorter than the timeout") } if p.config.HealthCheck.HealthyThresholdCount != 0 { diff --git a/builtin/aws/lambda/function_url/plugin.pb.go b/builtin/aws/lambda/function_url/function_url.pb.go similarity index 59% rename from builtin/aws/lambda/function_url/plugin.pb.go rename to builtin/aws/lambda/function_url/function_url.pb.go index 40129b03c..cf693498a 100644 --- a/builtin/aws/lambda/function_url/plugin.pb.go +++ b/builtin/aws/lambda/function_url/function_url.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: function_url.proto package function_url @@ -40,7 +40,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_function_url_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -53,7 +53,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_function_url_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -66,7 +66,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_function_url_proto_rawDescGZIP(), []int{0} } func (x *Release) GetUrl() string { @@ -114,7 +114,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_function_url_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -127,7 +127,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_function_url_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -140,7 +140,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_function_url_proto_rawDescGZIP(), []int{1} } type Resource_FunctionUrl struct { @@ -154,7 +154,7 @@ type Resource_FunctionUrl struct { func (x *Resource_FunctionUrl) Reset() { *x = Resource_FunctionUrl{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_function_url_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -167,7 +167,7 @@ func (x *Resource_FunctionUrl) String() string { func (*Resource_FunctionUrl) ProtoMessage() {} func (x *Resource_FunctionUrl) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_function_url_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -180,7 +180,7 @@ func (x *Resource_FunctionUrl) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_FunctionUrl.ProtoReflect.Descriptor instead. func (*Resource_FunctionUrl) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1, 0} + return file_function_url_proto_rawDescGZIP(), []int{1, 0} } func (x *Resource_FunctionUrl) GetUrl() string { @@ -190,52 +190,52 @@ func (x *Resource_FunctionUrl) GetUrl() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x75, 0x72, 0x6c, 0x1a, 0x13, 0x6f, 0x70, - 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, - 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x66, 0x75, 0x6e, 0x63, 0x5f, - 0x61, 0x72, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x75, 0x6e, 0x63, 0x41, - 0x72, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x76, 0x65, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x35, 0x0a, 0x0e, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, - 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x22, 0x2b, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x1f, - 0x0a, 0x0b, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x42, - 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, - 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, - 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x6c, 0x61, 0x6d, - 0x62, 0x64, 0x61, 0x2f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x75, 0x72, 0x6c, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_function_url_proto protoreflect.FileDescriptor + +var file_function_url_proto_rawDesc = []byte{ + 0x0a, 0x12, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x75, 0x72, 0x6c, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x75, + 0x72, 0x6c, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, + 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, + 0x08, 0x66, 0x75, 0x6e, 0x63, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x66, 0x75, 0x6e, 0x63, 0x41, 0x72, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x5f, + 0x61, 0x72, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x76, 0x65, 0x72, 0x41, 0x72, + 0x6e, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, + 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x2b, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x1a, 0x1f, 0x0a, 0x0b, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x72, 0x6c, 0x42, 0x3f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, + 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, + 0x77, 0x73, 0x2f, 0x6c, 0x61, 0x6d, 0x62, 0x64, 0x61, 0x2f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x75, 0x72, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_function_url_proto_rawDescOnce sync.Once + file_function_url_proto_rawDescData = file_function_url_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_function_url_proto_rawDescGZIP() []byte { + file_function_url_proto_rawDescOnce.Do(func() { + file_function_url_proto_rawDescData = protoimpl.X.CompressGZIP(file_function_url_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_function_url_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_plugin_proto_goTypes = []interface{}{ +var file_function_url_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_function_url_proto_goTypes = []interface{}{ (*Release)(nil), // 0: function_url.Release (*Resource)(nil), // 1: function_url.Resource (*Resource_FunctionUrl)(nil), // 2: function_url.Resource.FunctionUrl (*opaqueany.Any)(nil), // 3: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_function_url_proto_depIdxs = []int32{ 3, // 0: function_url.Release.resource_state:type_name -> opaqueany.Any 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -244,13 +244,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_function_url_proto_init() } +func file_function_url_proto_init() { + if File_function_url_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_function_url_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -262,7 +262,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_function_url_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -274,7 +274,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_function_url_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_FunctionUrl); i { case 0: return &v.state @@ -291,18 +291,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_function_url_proto_rawDesc, NumEnums: 0, NumMessages: 3, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_function_url_proto_goTypes, + DependencyIndexes: file_function_url_proto_depIdxs, + MessageInfos: file_function_url_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_function_url_proto = out.File + file_function_url_proto_rawDesc = nil + file_function_url_proto_goTypes = nil + file_function_url_proto_depIdxs = nil } diff --git a/builtin/aws/lambda/function_url/plugin.proto b/builtin/aws/lambda/function_url/function_url.proto similarity index 100% rename from builtin/aws/lambda/function_url/plugin.proto rename to builtin/aws/lambda/function_url/function_url.proto diff --git a/builtin/aws/lambda/function_url/plugin.go b/builtin/aws/lambda/function_url/plugin.go index 8e2da9ca2..b057317f8 100644 --- a/builtin/aws/lambda/function_url/plugin.go +++ b/builtin/aws/lambda/function_url/plugin.go @@ -4,7 +4,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. function_url.proto // Options are the SDK options to use for instantiation for the plugin. var Options = []sdk.Option{ diff --git a/builtin/aws/lambda/lambda.go b/builtin/aws/lambda/lambda.go index df92dc1fb..ef12aa0bf 100644 --- a/builtin/aws/lambda/lambda.go +++ b/builtin/aws/lambda/lambda.go @@ -5,7 +5,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. lambda.proto // Options are the SDK options to use for instantiation for // the Google Cloud Run plugin. diff --git a/builtin/aws/lambda/plugin.pb.go b/builtin/aws/lambda/lambda.pb.go similarity index 81% rename from builtin/aws/lambda/plugin.pb.go rename to builtin/aws/lambda/lambda.pb.go index 0abfaab8f..18ab4b29e 100644 --- a/builtin/aws/lambda/plugin.pb.go +++ b/builtin/aws/lambda/lambda.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: lambda.proto package lambda @@ -45,7 +45,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_lambda_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -58,7 +58,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_lambda_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -71,7 +71,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_lambda_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetId() string { @@ -123,10 +123,10 @@ func (x *Deployment) GetStorage() int64 { return 0 } -var File_plugin_proto protoreflect.FileDescriptor +var File_lambda_proto protoreflect.FileDescriptor -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, +var file_lambda_proto_rawDesc = []byte{ + 0x0a, 0x0c, 0x6c, 0x61, 0x6d, 0x62, 0x64, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x61, 0x77, 0x73, 0x2e, 0x6c, 0x61, 0x6d, 0x62, 0x64, 0x61, 0x22, 0xc6, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, @@ -147,22 +147,22 @@ var file_plugin_proto_rawDesc = []byte{ } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_lambda_proto_rawDescOnce sync.Once + file_lambda_proto_rawDescData = file_lambda_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_lambda_proto_rawDescGZIP() []byte { + file_lambda_proto_rawDescOnce.Do(func() { + file_lambda_proto_rawDescData = protoimpl.X.CompressGZIP(file_lambda_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_lambda_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_lambda_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_lambda_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: aws.lambda.Deployment } -var file_plugin_proto_depIdxs = []int32{ +var file_lambda_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -170,13 +170,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_lambda_proto_init() } +func file_lambda_proto_init() { + if File_lambda_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_lambda_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -193,18 +193,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_lambda_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_lambda_proto_goTypes, + DependencyIndexes: file_lambda_proto_depIdxs, + MessageInfos: file_lambda_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_lambda_proto = out.File + file_lambda_proto_rawDesc = nil + file_lambda_proto_goTypes = nil + file_lambda_proto_depIdxs = nil } diff --git a/builtin/aws/lambda/plugin.proto b/builtin/aws/lambda/lambda.proto similarity index 100% rename from builtin/aws/lambda/plugin.proto rename to builtin/aws/lambda/lambda.proto diff --git a/builtin/azure/aci/aci.go b/builtin/azure/aci/aci.go index 669293591..60de7afef 100644 --- a/builtin/azure/aci/aci.go +++ b/builtin/azure/aci/aci.go @@ -5,7 +5,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. aci.proto // Options are the SDK options to use for instantiation for // the Azure ACI plugin. diff --git a/builtin/azure/aci/plugin.pb.go b/builtin/azure/aci/aci.pb.go similarity index 60% rename from builtin/azure/aci/plugin.pb.go rename to builtin/azure/aci/aci.pb.go index 1a1537d13..7a91946ff 100644 --- a/builtin/azure/aci/plugin.pb.go +++ b/builtin/azure/aci/aci.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: aci.proto package aci @@ -33,7 +33,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_aci_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -46,7 +46,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_aci_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -59,7 +59,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_aci_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetUrl() string { @@ -94,7 +94,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_aci_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -107,7 +107,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_aci_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -120,7 +120,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_aci_proto_rawDescGZIP(), []int{1} } func (x *Release) GetUrl() string { @@ -143,7 +143,7 @@ type Deployment_ContainerGroup struct { func (x *Deployment_ContainerGroup) Reset() { *x = Deployment_ContainerGroup{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_aci_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -156,7 +156,7 @@ func (x *Deployment_ContainerGroup) String() string { func (*Deployment_ContainerGroup) ProtoMessage() {} func (x *Deployment_ContainerGroup) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_aci_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -169,7 +169,7 @@ func (x *Deployment_ContainerGroup) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment_ContainerGroup.ProtoReflect.Descriptor instead. func (*Deployment_ContainerGroup) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0, 0} + return file_aci_proto_rawDescGZIP(), []int{0, 0} } func (x *Deployment_ContainerGroup) GetName() string { @@ -193,53 +193,53 @@ func (x *Deployment_ContainerGroup) GetSubscriptionId() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, - 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2e, 0x61, 0x63, 0x69, 0x22, 0xf3, 0x01, 0x0a, 0x0a, 0x44, 0x65, - 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x4d, 0x0a, 0x0f, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2e, 0x61, 0x63, 0x69, 0x2e, - 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x74, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, - 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, - 0x1b, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, - 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x42, 0x31, 0x5a, 0x2f, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, - 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, - 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x61, 0x63, 0x69, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_aci_proto protoreflect.FileDescriptor + +var file_aci_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x61, 0x63, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x61, 0x7a, 0x75, + 0x72, 0x65, 0x2e, 0x61, 0x63, 0x69, 0x22, 0xf3, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, + 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x4d, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x61, + 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x24, 0x2e, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2e, 0x61, 0x63, 0x69, 0x2e, 0x44, 0x65, 0x70, + 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x74, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, + 0x6e, 0x65, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x75, + 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x1b, 0x0a, 0x07, + 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, + 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, + 0x69, 0x6e, 0x2f, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x61, 0x63, 0x69, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_aci_proto_rawDescOnce sync.Once + file_aci_proto_rawDescData = file_aci_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_aci_proto_rawDescGZIP() []byte { + file_aci_proto_rawDescOnce.Do(func() { + file_aci_proto_rawDescData = protoimpl.X.CompressGZIP(file_aci_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_aci_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_plugin_proto_goTypes = []interface{}{ +var file_aci_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_aci_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: azure.aci.Deployment (*Release)(nil), // 1: azure.aci.Release (*Deployment_ContainerGroup)(nil), // 2: azure.aci.Deployment.ContainerGroup } -var file_plugin_proto_depIdxs = []int32{ +var file_aci_proto_depIdxs = []int32{ 2, // 0: azure.aci.Deployment.container_group:type_name -> azure.aci.Deployment.ContainerGroup 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -248,13 +248,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_aci_proto_init() } +func file_aci_proto_init() { + if File_aci_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_aci_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -266,7 +266,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_aci_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -278,7 +278,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_aci_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment_ContainerGroup); i { case 0: return &v.state @@ -295,18 +295,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_aci_proto_rawDesc, NumEnums: 0, NumMessages: 3, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_aci_proto_goTypes, + DependencyIndexes: file_aci_proto_depIdxs, + MessageInfos: file_aci_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_aci_proto = out.File + file_aci_proto_rawDesc = nil + file_aci_proto_goTypes = nil + file_aci_proto_depIdxs = nil } diff --git a/builtin/azure/aci/plugin.proto b/builtin/azure/aci/aci.proto similarity index 100% rename from builtin/azure/aci/plugin.proto rename to builtin/azure/aci/aci.proto diff --git a/builtin/azure/aci/platform.go b/builtin/azure/aci/platform.go index ad357eeed..a6d9a9fe5 100644 --- a/builtin/azure/aci/platform.go +++ b/builtin/azure/aci/platform.go @@ -360,7 +360,7 @@ To update the location you will need to manually destroy and recreate the resour if log.IsTrace() { bs, err := containerGroupResult.MarshalJSON() if err != nil { - return nil, status.Errorf(codes.Aborted, err.Error()) + return nil, status.Errorf(codes.Aborted, "%s", err.Error()) } log.Trace("container group JSON", "json", base64.StdEncoding.EncodeToString(bs)) diff --git a/builtin/azure/aci/validation.go b/builtin/azure/aci/validation.go index 8f004dc4e..ee230c3c8 100644 --- a/builtin/azure/aci/validation.go +++ b/builtin/azure/aci/validation.go @@ -42,7 +42,7 @@ func validateConfig(c Config) error { } } - return fmt.Errorf(errorMessage) + return fmt.Errorf("%s", errorMessage) } return nil diff --git a/builtin/docker/plugin.pb.go b/builtin/docker/docker.pb.go similarity index 89% rename from builtin/docker/plugin.pb.go rename to builtin/docker/docker.pb.go index 4c3e823b3..e0ad2df9f 100644 --- a/builtin/docker/plugin.pb.go +++ b/builtin/docker/docker.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: docker.proto package docker @@ -49,7 +49,7 @@ type Image struct { func (x *Image) Reset() { *x = Image{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_docker_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -62,7 +62,7 @@ func (x *Image) String() string { func (*Image) ProtoMessage() {} func (x *Image) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_docker_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -75,7 +75,7 @@ func (x *Image) ProtoReflect() protoreflect.Message { // Deprecated: Use Image.ProtoReflect.Descriptor instead. func (*Image) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_docker_proto_rawDescGZIP(), []int{0} } func (x *Image) GetImage() string { @@ -171,7 +171,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_docker_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -184,7 +184,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_docker_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -197,7 +197,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_docker_proto_rawDescGZIP(), []int{1} } func (x *Deployment) GetId() string { @@ -239,7 +239,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_docker_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -252,7 +252,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_docker_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -265,7 +265,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2} + return file_docker_proto_rawDescGZIP(), []int{2} } func (x *Release) GetUrl() string { @@ -285,7 +285,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_docker_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -298,7 +298,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_docker_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -311,7 +311,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{3} + return file_docker_proto_rawDescGZIP(), []int{3} } type TaskInfo struct { @@ -325,7 +325,7 @@ type TaskInfo struct { func (x *TaskInfo) Reset() { *x = TaskInfo{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_docker_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -338,7 +338,7 @@ func (x *TaskInfo) String() string { func (*TaskInfo) ProtoMessage() {} func (x *TaskInfo) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_docker_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -351,7 +351,7 @@ func (x *TaskInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskInfo.ProtoReflect.Descriptor instead. func (*TaskInfo) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{4} + return file_docker_proto_rawDescGZIP(), []int{4} } func (x *TaskInfo) GetId() string { @@ -388,7 +388,7 @@ type AccessInfo struct { func (x *AccessInfo) Reset() { *x = AccessInfo{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_docker_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -401,7 +401,7 @@ func (x *AccessInfo) String() string { func (*AccessInfo) ProtoMessage() {} func (x *AccessInfo) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_docker_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -414,7 +414,7 @@ func (x *AccessInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use AccessInfo.ProtoReflect.Descriptor instead. func (*AccessInfo) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{5} + return file_docker_proto_rawDescGZIP(), []int{5} } func (x *AccessInfo) GetImage() string { @@ -508,7 +508,7 @@ type Image_RegistryLocation struct { func (x *Image_RegistryLocation) Reset() { *x = Image_RegistryLocation{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_docker_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -521,7 +521,7 @@ func (x *Image_RegistryLocation) String() string { func (*Image_RegistryLocation) ProtoMessage() {} func (x *Image_RegistryLocation) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_docker_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -534,7 +534,7 @@ func (x *Image_RegistryLocation) ProtoReflect() protoreflect.Message { // Deprecated: Use Image_RegistryLocation.ProtoReflect.Descriptor instead. func (*Image_RegistryLocation) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0, 0} + return file_docker_proto_rawDescGZIP(), []int{0, 0} } func (x *Image_RegistryLocation) GetWaypointGenerated() bool { @@ -555,7 +555,7 @@ type Resource_Network struct { func (x *Resource_Network) Reset() { *x = Resource_Network{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[7] + mi := &file_docker_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -568,7 +568,7 @@ func (x *Resource_Network) String() string { func (*Resource_Network) ProtoMessage() {} func (x *Resource_Network) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[7] + mi := &file_docker_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -581,7 +581,7 @@ func (x *Resource_Network) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Network.ProtoReflect.Descriptor instead. func (*Resource_Network) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{3, 0} + return file_docker_proto_rawDescGZIP(), []int{3, 0} } func (x *Resource_Network) GetName() string { @@ -603,7 +603,7 @@ type Resource_Container struct { func (x *Resource_Container) Reset() { *x = Resource_Container{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[8] + mi := &file_docker_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -616,7 +616,7 @@ func (x *Resource_Container) String() string { func (*Resource_Container) ProtoMessage() {} func (x *Resource_Container) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[8] + mi := &file_docker_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -629,7 +629,7 @@ func (x *Resource_Container) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Container.ProtoReflect.Descriptor instead. func (*Resource_Container) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{3, 1} + return file_docker_proto_rawDescGZIP(), []int{3, 1} } func (x *Resource_Container) GetId() string { @@ -660,7 +660,7 @@ type AccessInfo_UserPass struct { func (x *AccessInfo_UserPass) Reset() { *x = AccessInfo_UserPass{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[9] + mi := &file_docker_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -673,7 +673,7 @@ func (x *AccessInfo_UserPass) String() string { func (*AccessInfo_UserPass) ProtoMessage() {} func (x *AccessInfo_UserPass) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[9] + mi := &file_docker_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -686,7 +686,7 @@ func (x *AccessInfo_UserPass) ProtoReflect() protoreflect.Message { // Deprecated: Use AccessInfo_UserPass.ProtoReflect.Descriptor instead. func (*AccessInfo_UserPass) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{5, 0} + return file_docker_proto_rawDescGZIP(), []int{5, 0} } func (x *AccessInfo_UserPass) GetUsername() string { @@ -703,10 +703,10 @@ func (x *AccessInfo_UserPass) GetPassword() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor +var File_docker_proto protoreflect.FileDescriptor -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, +var file_docker_proto_rawDesc = []byte{ + 0x0a, 0x0c, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x64, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x09, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcb, @@ -773,19 +773,19 @@ var file_plugin_proto_rawDesc = []byte{ } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_docker_proto_rawDescOnce sync.Once + file_docker_proto_rawDescData = file_docker_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_docker_proto_rawDescGZIP() []byte { + file_docker_proto_rawDescOnce.Do(func() { + file_docker_proto_rawDescData = protoimpl.X.CompressGZIP(file_docker_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_docker_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_plugin_proto_goTypes = []interface{}{ +var file_docker_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_docker_proto_goTypes = []interface{}{ (*Image)(nil), // 0: docker.Image (*Deployment)(nil), // 1: docker.Deployment (*Release)(nil), // 2: docker.Release @@ -799,7 +799,7 @@ var file_plugin_proto_goTypes = []interface{}{ (*emptypb.Empty)(nil), // 10: google.protobuf.Empty (*opaqueany.Any)(nil), // 11: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_docker_proto_depIdxs = []int32{ 6, // 0: docker.Image.registry:type_name -> docker.Image.RegistryLocation 10, // 1: docker.Image.docker:type_name -> google.protobuf.Empty 10, // 2: docker.Image.unused_img:type_name -> google.protobuf.Empty @@ -812,13 +812,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:5] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_docker_proto_init() } +func file_docker_proto_init() { + if File_docker_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Image); i { case 0: return &v.state @@ -830,7 +830,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -842,7 +842,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -854,7 +854,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -866,7 +866,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskInfo); i { case 0: return &v.state @@ -878,7 +878,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AccessInfo); i { case 0: return &v.state @@ -890,7 +890,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Image_RegistryLocation); i { case 0: return &v.state @@ -902,7 +902,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Network); i { case 0: return &v.state @@ -914,7 +914,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Container); i { case 0: return &v.state @@ -926,7 +926,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_docker_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AccessInfo_UserPass); i { case 0: return &v.state @@ -939,12 +939,12 @@ func file_plugin_proto_init() { } } } - file_plugin_proto_msgTypes[0].OneofWrappers = []interface{}{ + file_docker_proto_msgTypes[0].OneofWrappers = []interface{}{ (*Image_Registry)(nil), (*Image_Docker)(nil), (*Image_UnusedImg)(nil), } - file_plugin_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_docker_proto_msgTypes[5].OneofWrappers = []interface{}{ (*AccessInfo_Header)(nil), (*AccessInfo_Encoded)(nil), (*AccessInfo_UserPass_)(nil), @@ -953,18 +953,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_docker_proto_rawDesc, NumEnums: 0, NumMessages: 10, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_docker_proto_goTypes, + DependencyIndexes: file_docker_proto_depIdxs, + MessageInfos: file_docker_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_docker_proto = out.File + file_docker_proto_rawDesc = nil + file_docker_proto_goTypes = nil + file_docker_proto_depIdxs = nil } diff --git a/builtin/docker/plugin.proto b/builtin/docker/docker.proto similarity index 100% rename from builtin/docker/plugin.proto rename to builtin/docker/docker.proto diff --git a/builtin/docker/main.go b/builtin/docker/main.go index ccb4f3fdd..07f99eb5f 100644 --- a/builtin/docker/main.go +++ b/builtin/docker/main.go @@ -4,7 +4,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../thirdparty/proto/opaqueany --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../thirdparty/proto/opaqueany --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. docker.proto const platformName = "docker" diff --git a/builtin/exec/plugin.pb.go b/builtin/exec/exec.pb.go similarity index 61% rename from builtin/exec/plugin.pb.go rename to builtin/exec/exec.pb.go index d64516364..cc8435668 100644 --- a/builtin/exec/plugin.pb.go +++ b/builtin/exec/exec.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: exec.proto package exec @@ -32,7 +32,7 @@ type Input struct { func (x *Input) Reset() { *x = Input{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_exec_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Input) String() string { func (*Input) ProtoMessage() {} func (x *Input) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_exec_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Input) ProtoReflect() protoreflect.Message { // Deprecated: Use Input.ProtoReflect.Descriptor instead. func (*Input) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_exec_proto_rawDescGZIP(), []int{0} } func (x *Input) GetData() map[string]*Input_Value { @@ -77,7 +77,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_exec_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -90,7 +90,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_exec_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -103,7 +103,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_exec_proto_rawDescGZIP(), []int{1} } type Input_Value struct { @@ -120,7 +120,7 @@ type Input_Value struct { func (x *Input_Value) Reset() { *x = Input_Value{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_exec_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -133,7 +133,7 @@ func (x *Input_Value) String() string { func (*Input_Value) ProtoMessage() {} func (x *Input_Value) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_exec_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -146,7 +146,7 @@ func (x *Input_Value) ProtoReflect() protoreflect.Message { // Deprecated: Use Input_Value.ProtoReflect.Descriptor instead. func (*Input_Value) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0, 1} + return file_exec_proto_rawDescGZIP(), []int{0, 1} } func (m *Input_Value) GetValue() isInput_Value_Value { @@ -173,48 +173,47 @@ type Input_Value_Text struct { func (*Input_Value_Text) isInput_Value_Value() {} -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, - 0x65, 0x78, 0x65, 0x63, 0x22, 0xa6, 0x01, 0x0a, 0x05, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x29, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, - 0x78, 0x65, 0x63, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x4a, 0x0a, 0x09, 0x44, 0x61, 0x74, - 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x2e, 0x49, - 0x6e, 0x70, 0x75, 0x74, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x26, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, - 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, - 0x74, 0x65, 0x78, 0x74, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x0c, 0x0a, - 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x2c, 0x5a, 0x2a, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, - 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, - 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x65, 0x78, 0x65, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, +var File_exec_proto protoreflect.FileDescriptor + +var file_exec_proto_rawDesc = []byte{ + 0x0a, 0x0a, 0x65, 0x78, 0x65, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x65, 0x78, + 0x65, 0x63, 0x22, 0xa6, 0x01, 0x0a, 0x05, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x29, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x65, 0x78, 0x65, + 0x63, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x4a, 0x0a, 0x09, 0x44, 0x61, 0x74, 0x61, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x2e, 0x49, 0x6e, 0x70, + 0x75, 0x74, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x1a, 0x26, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x04, + 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x74, 0x65, + 0x78, 0x74, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x44, + 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, + 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, + 0x69, 0x6e, 0x2f, 0x65, 0x78, 0x65, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_exec_proto_rawDescOnce sync.Once + file_exec_proto_rawDescData = file_exec_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_exec_proto_rawDescGZIP() []byte { + file_exec_proto_rawDescOnce.Do(func() { + file_exec_proto_rawDescData = protoimpl.X.CompressGZIP(file_exec_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_exec_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_plugin_proto_goTypes = []interface{}{ +var file_exec_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_exec_proto_goTypes = []interface{}{ (*Input)(nil), // 0: exec.Input (*Deployment)(nil), // 1: exec.Deployment nil, // 2: exec.Input.DataEntry (*Input_Value)(nil), // 3: exec.Input.Value } -var file_plugin_proto_depIdxs = []int32{ +var file_exec_proto_depIdxs = []int32{ 2, // 0: exec.Input.data:type_name -> exec.Input.DataEntry 3, // 1: exec.Input.DataEntry.value:type_name -> exec.Input.Value 2, // [2:2] is the sub-list for method output_type @@ -224,13 +223,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_exec_proto_init() } +func file_exec_proto_init() { + if File_exec_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_exec_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Input); i { case 0: return &v.state @@ -242,7 +241,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_exec_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -254,7 +253,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_exec_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Input_Value); i { case 0: return &v.state @@ -267,25 +266,25 @@ func file_plugin_proto_init() { } } } - file_plugin_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_exec_proto_msgTypes[3].OneofWrappers = []interface{}{ (*Input_Value_Text)(nil), } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_exec_proto_rawDesc, NumEnums: 0, NumMessages: 4, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_exec_proto_goTypes, + DependencyIndexes: file_exec_proto_depIdxs, + MessageInfos: file_exec_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_exec_proto = out.File + file_exec_proto_rawDesc = nil + file_exec_proto_goTypes = nil + file_exec_proto_depIdxs = nil } diff --git a/builtin/exec/plugin.proto b/builtin/exec/exec.proto similarity index 100% rename from builtin/exec/plugin.proto rename to builtin/exec/exec.proto diff --git a/builtin/exec/main.go b/builtin/exec/main.go index 58619adf5..07a104452 100644 --- a/builtin/exec/main.go +++ b/builtin/exec/main.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. exec.proto // Options are the SDK options to use for instantiation. var Options = []sdk.Option{ diff --git a/builtin/files/files.go b/builtin/files/files.go index a4109c46e..655f2aad1 100644 --- a/builtin/files/files.go +++ b/builtin/files/files.go @@ -5,7 +5,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. files.proto // Options are the SDK options to use for instantiation for // the Files plugin. diff --git a/builtin/files/plugin.pb.go b/builtin/files/files.pb.go similarity index 54% rename from builtin/files/plugin.pb.go rename to builtin/files/files.pb.go index 424eff936..45eed9ced 100644 --- a/builtin/files/plugin.pb.go +++ b/builtin/files/files.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: files.proto package files @@ -31,7 +31,7 @@ type Files struct { func (x *Files) Reset() { *x = Files{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_files_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -44,7 +44,7 @@ func (x *Files) String() string { func (*Files) ProtoMessage() {} func (x *Files) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_files_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -57,7 +57,7 @@ func (x *Files) ProtoReflect() protoreflect.Message { // Deprecated: Use Files.ProtoReflect.Descriptor instead. func (*Files) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_files_proto_rawDescGZIP(), []int{0} } func (x *Files) GetPath() string { @@ -67,35 +67,35 @@ func (x *Files) GetPath() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor +var File_files_proto protoreflect.FileDescriptor -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, - 0x66, 0x69, 0x6c, 0x65, 0x73, 0x22, 0x1b, 0x0a, 0x05, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x12, - 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, - 0x74, 0x68, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, - 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x66, 0x69, 0x6c, 0x65, - 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_files_proto_rawDesc = []byte{ + 0x0a, 0x0b, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x66, + 0x69, 0x6c, 0x65, 0x73, 0x22, 0x1b, 0x0a, 0x05, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, + 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, + 0x68, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, + 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_files_proto_rawDescOnce sync.Once + file_files_proto_rawDescData = file_files_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_files_proto_rawDescGZIP() []byte { + file_files_proto_rawDescOnce.Do(func() { + file_files_proto_rawDescData = protoimpl.X.CompressGZIP(file_files_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_files_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_files_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_files_proto_goTypes = []interface{}{ (*Files)(nil), // 0: files.Files } -var file_plugin_proto_depIdxs = []int32{ +var file_files_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -103,13 +103,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_files_proto_init() } +func file_files_proto_init() { + if File_files_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_files_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Files); i { case 0: return &v.state @@ -126,18 +126,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_files_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_files_proto_goTypes, + DependencyIndexes: file_files_proto_depIdxs, + MessageInfos: file_files_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_files_proto = out.File + file_files_proto_rawDesc = nil + file_files_proto_goTypes = nil + file_files_proto_depIdxs = nil } diff --git a/builtin/files/plugin.proto b/builtin/files/files.proto similarity index 100% rename from builtin/files/plugin.proto rename to builtin/files/files.proto diff --git a/builtin/google/cloudrun/cloudrun.go b/builtin/google/cloudrun/cloudrun.go index 88332a4bf..720c70ccb 100644 --- a/builtin/google/cloudrun/cloudrun.go +++ b/builtin/google/cloudrun/cloudrun.go @@ -5,7 +5,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../thirdparty/proto/opaqueany --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../thirdparty/proto/opaqueany --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. cloudrun.proto // Options are the SDK options to use for instantiation for // the Google Cloud Run plugin. diff --git a/builtin/google/cloudrun/plugin.pb.go b/builtin/google/cloudrun/cloudrun.pb.go similarity index 62% rename from builtin/google/cloudrun/plugin.pb.go rename to builtin/google/cloudrun/cloudrun.pb.go index 7d42285c0..4f70fa9a8 100644 --- a/builtin/google/cloudrun/plugin.pb.go +++ b/builtin/google/cloudrun/cloudrun.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: cloudrun.proto package cloudrun @@ -37,7 +37,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_cloudrun_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -50,7 +50,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_cloudrun_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -63,7 +63,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_cloudrun_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetUrl() string { @@ -119,7 +119,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_cloudrun_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -132,7 +132,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_cloudrun_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -145,7 +145,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_cloudrun_proto_rawDescGZIP(), []int{1} } func (x *Release) GetUrl() string { @@ -164,7 +164,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_cloudrun_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -177,7 +177,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_cloudrun_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -190,7 +190,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2} + return file_cloudrun_proto_rawDescGZIP(), []int{2} } type Deployment_Resource struct { @@ -206,7 +206,7 @@ type Deployment_Resource struct { func (x *Deployment_Resource) Reset() { *x = Deployment_Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_cloudrun_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -219,7 +219,7 @@ func (x *Deployment_Resource) String() string { func (*Deployment_Resource) ProtoMessage() {} func (x *Deployment_Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_cloudrun_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -232,7 +232,7 @@ func (x *Deployment_Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment_Resource.ProtoReflect.Descriptor instead. func (*Deployment_Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0, 0} + return file_cloudrun_proto_rawDescGZIP(), []int{0, 0} } func (x *Deployment_Resource) GetLocation() string { @@ -268,7 +268,7 @@ type Resource_Service struct { func (x *Resource_Service) Reset() { *x = Resource_Service{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_cloudrun_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -281,7 +281,7 @@ func (x *Resource_Service) String() string { func (*Resource_Service) ProtoMessage() {} func (x *Resource_Service) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_cloudrun_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -294,7 +294,7 @@ func (x *Resource_Service) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Service.ProtoReflect.Descriptor instead. func (*Resource_Service) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 0} + return file_cloudrun_proto_rawDescGZIP(), []int{2, 0} } func (x *Resource_Service) GetApiName() string { @@ -311,59 +311,59 @@ func (x *Resource_Service) GetRevisionName() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, 0x75, 0x6e, 0x1a, - 0x09, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb6, 0x02, 0x0a, 0x0a, 0x44, - 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x40, 0x0a, 0x08, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, 0x75, 0x6e, 0x2e, - 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1f, 0x0a, - 0x0b, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, - 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x1a, 0x54, 0x0a, - 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x1b, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, - 0x22, 0x55, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x49, 0x0a, 0x07, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x69, 0x4e, 0x61, - 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, - 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, - 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, 0x75, 0x6e, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_cloudrun_proto protoreflect.FileDescriptor + +var file_cloudrun_proto_rawDesc = []byte{ + 0x0a, 0x0e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, 0x75, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x12, 0x0f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, 0x75, + 0x6e, 0x1a, 0x09, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb6, 0x02, 0x0a, + 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x40, 0x0a, + 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, 0x75, + 0x6e, 0x2e, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, + 0x1f, 0x0a, 0x0b, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, + 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x1a, + 0x54, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, + 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, + 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, + 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, + 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1b, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 0x72, 0x6c, 0x22, 0x55, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x49, + 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x70, 0x69, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x70, 0x69, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x76, + 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, + 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, + 0x69, 0x6e, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x72, + 0x75, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_cloudrun_proto_rawDescOnce sync.Once + file_cloudrun_proto_rawDescData = file_cloudrun_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_cloudrun_proto_rawDescGZIP() []byte { + file_cloudrun_proto_rawDescOnce.Do(func() { + file_cloudrun_proto_rawDescData = protoimpl.X.CompressGZIP(file_cloudrun_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_cloudrun_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_plugin_proto_goTypes = []interface{}{ +var file_cloudrun_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_cloudrun_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: google.cloudrun.Deployment (*Release)(nil), // 1: google.cloudrun.Release (*Resource)(nil), // 2: google.cloudrun.Resource @@ -371,7 +371,7 @@ var file_plugin_proto_goTypes = []interface{}{ (*Resource_Service)(nil), // 4: google.cloudrun.Resource.Service (*opaqueany.Any)(nil), // 5: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_cloudrun_proto_depIdxs = []int32{ 3, // 0: google.cloudrun.Deployment.resource:type_name -> google.cloudrun.Deployment.Resource 5, // 1: google.cloudrun.Deployment.resource_state:type_name -> opaqueany.Any 2, // [2:2] is the sub-list for method output_type @@ -381,13 +381,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_cloudrun_proto_init() } +func file_cloudrun_proto_init() { + if File_cloudrun_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_cloudrun_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -399,7 +399,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_cloudrun_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -411,7 +411,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_cloudrun_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -423,7 +423,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_cloudrun_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment_Resource); i { case 0: return &v.state @@ -435,7 +435,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_cloudrun_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Service); i { case 0: return &v.state @@ -452,18 +452,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_cloudrun_proto_rawDesc, NumEnums: 0, NumMessages: 5, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_cloudrun_proto_goTypes, + DependencyIndexes: file_cloudrun_proto_depIdxs, + MessageInfos: file_cloudrun_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_cloudrun_proto = out.File + file_cloudrun_proto_rawDesc = nil + file_cloudrun_proto_goTypes = nil + file_cloudrun_proto_depIdxs = nil } diff --git a/builtin/google/cloudrun/plugin.proto b/builtin/google/cloudrun/cloudrun.proto similarity index 100% rename from builtin/google/cloudrun/plugin.proto rename to builtin/google/cloudrun/cloudrun.proto diff --git a/builtin/google/cloudrun/deployment.go b/builtin/google/cloudrun/deployment.go index f2a838b84..00b4a2e34 100644 --- a/builtin/google/cloudrun/deployment.go +++ b/builtin/google/cloudrun/deployment.go @@ -48,7 +48,7 @@ func (d *Deployment) apiService(ctx context.Context) (*run.APIService, error) { option.WithEndpoint("https://"+d.Resource.Location+"-run.googleapis.com"), ) if err != nil { - return nil, status.Errorf(codes.Aborted, err.Error()) + return nil, status.Errorf(codes.Aborted, "%s", err.Error()) } return result, nil @@ -58,7 +58,7 @@ func (d *Deployment) apiService(ctx context.Context) (*run.APIService, error) { func (d *Deployment) iamAPIService(ctx context.Context) (*iam.Service, error) { result, err := iam.NewService(ctx) if err != nil { - return nil, status.Errorf(codes.Aborted, err.Error()) + return nil, status.Errorf(codes.Aborted, "%s", err.Error()) } return result, nil diff --git a/builtin/google/cloudrun/platform.go b/builtin/google/cloudrun/platform.go index 6b4fa5e70..721f402be 100644 --- a/builtin/google/cloudrun/platform.go +++ b/builtin/google/cloudrun/platform.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "google.golang.org/api/iam/v1" "google.golang.org/api/option" run "google.golang.org/api/run/v1" "google.golang.org/grpc/codes" @@ -102,87 +101,89 @@ func (p *Platform) ValidateAuth( apiService, err := deployment.apiService(ctx) if err != nil { ui.Output("Error constructing api client: "+err.Error(), terminal.WithErrorStyle()) - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } // TODO auth doesn't work if the service isn't already created, which is a common case. // Until that is fixed, we disable the auth checks. + _ = apiService return nil - // We'll update the user in real time - st := ui.Status() - defer st.Close() - - client := run.NewProjectsLocationsServicesService(apiService) - - expectedPermissions := []string{ - "roles/run.admin", - } - - // run.admin encompasses all the permissions we should need - testReq := run.TestIamPermissionsRequest{ - Permissions: expectedPermissions, - } - - // The resource we are checking permissions on - apiResource := fmt.Sprintf("projects/%s/locations/%s/services/%s", - p.config.Project, - p.config.Location, - src.App, - ) + /* + st := ui.Status() + defer st.Close() - st.Update("Testing Cloud Run IAM permissions...") - result, err := client.TestIamPermissions(apiResource, &testReq).Do() - if err != nil { - st.Step(terminal.StatusError, "Error testing Cloud Run IAM permissions: "+err.Error()) - return err - } - - // If our resulting permissions do not equal our expected permissions, auth does not validate - if !reflect.DeepEqual(result.Permissions, expectedPermissions) { - st.Step(terminal.StatusError, "Incorrect IAM permissions, received "+strings.Join(result.Permissions, ", ")) - return status.Errorf(codes.PermissionDenied, "incorrect IAM permissions, received %s", strings.Join(result.Permissions, ", ")) - } - - // Validate if user has access to the service account specified - if p.config.ServiceAccountName != "" { - - iamAPIService, err := deployment.iamAPIService(ctx) - if err != nil { - ui.Output("Error constructing api client: "+err.Error(), terminal.WithErrorStyle()) - return status.Errorf(codes.Aborted, err.Error()) - } - - client := iam.NewProjectsServiceAccountsService(iamAPIService) + client := run.NewProjectsLocationsServicesService(apiService) expectedPermissions := []string{ - "iam.serviceAccounts.actAs", + "roles/run.admin", } - // We need to ensure that the service creator has Service Account User role. - testReq := iam.TestIamPermissionsRequest{ + // run.admin encompasses all the permissions we should need + testReq := run.TestIamPermissionsRequest{ Permissions: expectedPermissions, } - apiResource := fmt.Sprintf("projects/%s/serviceAccounts/%s", + // The resource we are checking permissions on + apiResource := fmt.Sprintf("projects/%s/locations/%s/services/%s", p.config.Project, - p.config.ServiceAccountName, + p.config.Location, + src.App, ) - st.Update("Testing IAM permissions on the supplied service account...") + st.Update("Testing Cloud Run IAM permissions...") result, err := client.TestIamPermissions(apiResource, &testReq).Do() if err != nil { - st.Step(terminal.StatusError, "Error testing IAM permissions of the Service Account: "+err.Error()) + st.Step(terminal.StatusError, "Error testing Cloud Run IAM permissions: "+err.Error()) return err } // If our resulting permissions do not equal our expected permissions, auth does not validate if !reflect.DeepEqual(result.Permissions, expectedPermissions) { - st.Step(terminal.StatusError, "Incorrect IAM permissions on the Service Account, received "+strings.Join(result.Permissions, ", ")) - return status.Errorf(codes.PermissionDenied, "Incorrect IAM permissions on the Service Account, received %s", strings.Join(result.Permissions, ", ")) + st.Step(terminal.StatusError, "Incorrect IAM permissions, received "+strings.Join(result.Permissions, ", ")) + return status.Errorf(codes.PermissionDenied, "incorrect IAM permissions, received %s", strings.Join(result.Permissions, ", ")) } - } - return nil + + // Validate if user has access to the service account specified + if p.config.ServiceAccountName != "" { + + iamAPIService, err := deployment.iamAPIService(ctx) + if err != nil { + ui.Output("Error constructing api client: "+err.Error(), terminal.WithErrorStyle()) + return status.Errorf(codes.Aborted, "%s", err.Error()) + } + + client := iam.NewProjectsServiceAccountsService(iamAPIService) + + expectedPermissions := []string{ + "iam.serviceAccounts.actAs", + } + + // We need to ensure that the service creator has Service Account User role. + testReq := iam.TestIamPermissionsRequest{ + Permissions: expectedPermissions, + } + + apiResource := fmt.Sprintf("projects/%s/serviceAccounts/%s", + p.config.Project, + p.config.ServiceAccountName, + ) + + st.Update("Testing IAM permissions on the supplied service account...") + result, err := client.TestIamPermissions(apiResource, &testReq).Do() + if err != nil { + st.Step(terminal.StatusError, "Error testing IAM permissions of the Service Account: "+err.Error()) + return err + } + + // If our resulting permissions do not equal our expected permissions, auth does not validate + if !reflect.DeepEqual(result.Permissions, expectedPermissions) { + st.Step(terminal.StatusError, "Incorrect IAM permissions on the Service Account, received "+strings.Join(result.Permissions, ", ")) + return status.Errorf(codes.PermissionDenied, "Incorrect IAM permissions on the Service Account, received %s", strings.Join(result.Permissions, ", ")) + } + } + return nil + */ } func (p *Platform) resourceManager(log hclog.Logger) *resource.Manager { diff --git a/builtin/google/cloudrun/releaser.go b/builtin/google/cloudrun/releaser.go index b04603a7a..e0dbbe2f7 100644 --- a/builtin/google/cloudrun/releaser.go +++ b/builtin/google/cloudrun/releaser.go @@ -117,7 +117,7 @@ func (r *Releaser) setNoAuthPolicy( }, }).Context(ctx).Do() if err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } return nil diff --git a/builtin/google/cloudrun/validation.go b/builtin/google/cloudrun/validation.go index ad2e5891b..c4cef0c04 100644 --- a/builtin/google/cloudrun/validation.go +++ b/builtin/google/cloudrun/validation.go @@ -95,7 +95,7 @@ func validateConfig(c Config) error { } // if - return fmt.Errorf(errorMessage) + return fmt.Errorf("%s", errorMessage) } return nil diff --git a/builtin/k8s/apply/plugin.pb.go b/builtin/k8s/apply/k8sapply.pb.go similarity index 52% rename from builtin/k8s/apply/plugin.pb.go rename to builtin/k8s/apply/k8sapply.pb.go index 3a265307d..84ca6cb9d 100644 --- a/builtin/k8s/apply/plugin.pb.go +++ b/builtin/k8s/apply/k8sapply.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: k8sapply.proto package apply @@ -32,7 +32,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_k8sapply_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_k8sapply_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_k8sapply_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetPruneLabel() string { @@ -75,39 +75,39 @@ func (x *Deployment) GetPruneAllowlist() []string { return nil } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, - 0x6b, 0x38, 0x73, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x22, 0x56, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, - 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x75, 0x6e, 0x65, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x75, - 0x6e, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72, 0x75, 0x6e, 0x65, - 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x0e, 0x70, 0x72, 0x75, 0x6e, 0x65, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x6c, 0x69, 0x73, 0x74, - 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, - 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, - 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6b, 0x38, 0x73, 0x2f, 0x61, 0x70, - 0x70, 0x6c, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_k8sapply_proto protoreflect.FileDescriptor + +var file_k8sapply_proto_rawDesc = []byte{ + 0x0a, 0x0e, 0x6b, 0x38, 0x73, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x12, 0x08, 0x6b, 0x38, 0x73, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x22, 0x56, 0x0a, 0x0a, 0x44, 0x65, + 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x75, 0x6e, + 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, + 0x72, 0x75, 0x6e, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72, 0x75, + 0x6e, 0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x0e, 0x70, 0x72, 0x75, 0x6e, 0x65, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x6c, 0x69, + 0x73, 0x74, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, + 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6b, 0x38, 0x73, 0x2f, + 0x61, 0x70, 0x70, 0x6c, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_k8sapply_proto_rawDescOnce sync.Once + file_k8sapply_proto_rawDescData = file_k8sapply_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_k8sapply_proto_rawDescGZIP() []byte { + file_k8sapply_proto_rawDescOnce.Do(func() { + file_k8sapply_proto_rawDescData = protoimpl.X.CompressGZIP(file_k8sapply_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_k8sapply_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_k8sapply_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_k8sapply_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: k8sapply.Deployment } -var file_plugin_proto_depIdxs = []int32{ +var file_k8sapply_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -115,13 +115,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_k8sapply_proto_init() } +func file_k8sapply_proto_init() { + if File_k8sapply_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_k8sapply_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -138,18 +138,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_k8sapply_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_k8sapply_proto_goTypes, + DependencyIndexes: file_k8sapply_proto_depIdxs, + MessageInfos: file_k8sapply_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_k8sapply_proto = out.File + file_k8sapply_proto_rawDesc = nil + file_k8sapply_proto_goTypes = nil + file_k8sapply_proto_depIdxs = nil } diff --git a/builtin/k8s/apply/plugin.proto b/builtin/k8s/apply/k8sapply.proto similarity index 100% rename from builtin/k8s/apply/plugin.proto rename to builtin/k8s/apply/k8sapply.proto diff --git a/builtin/k8s/apply/plugin.go b/builtin/k8s/apply/plugin.go index 5a6e3e985..bbb9f84ca 100644 --- a/builtin/k8s/apply/plugin.go +++ b/builtin/k8s/apply/plugin.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. k8sapply.proto // Options are the SDK options to use for instantiation for the plugin. var Options = []sdk.Option{ diff --git a/builtin/k8s/canary/components/release-manager/readme.md b/builtin/k8s/canary/components/release-manager/readme.md index 92ac2c34b..219742001 100644 --- a/builtin/k8s/canary/components/release-manager/readme.md +++ b/builtin/k8s/canary/components/release-manager/readme.md @@ -7,14 +7,14 @@ groups within your job for promotion, if you have multiple task groups in your c deployment. -> **Note:** Using the `-prune=false` flag is recommended for this releaser. By default, -Waypoint prunes and destroys all unreleased deployments and keeps only one previous -deployment. Therefore, if `-prune=false` is not set, Waypoint may delete -your job via "pruning" a previous version. See [deployment pruning](/waypoint/docs/lifecycle/release#deployment-pruning) +Derrick prunes and destroys all unreleased deployments and keeps only one previous +deployment. Therefore, if `-prune=false` is not set, Derrick may delete +your job via "pruning" a previous version. See [deployment pruning](/derrick/docs/lifecycle/release#deployment-pruning) for more information. ### Release URL -If you want the URL of the release of your deployment to be published in Waypoint, +If you want the URL of the release of your deployment to be published in Derrick, you must set the meta 'waypoint.hashicorp.com/release_url' in your jobspec. The value specified in this meta field will be published as the release URL for your application. In the future, this may source from Consul. @@ -26,7 +26,7 @@ application. In the future, this may source from Consul. ### Examples ```hcl -// The waypoint.hcl file +// The derrick.hcl file release { use "nomad-jobspec-canary" { groups = [ @@ -115,7 +115,7 @@ job "web" { } } meta = { - // Ensure we set meta for Waypoint to detect the release URL + // Ensure we set meta for Derrick to detect the release URL "waypoint.hashicorp.com/release_url" = "http://app.ingress.dc1.consul:8080" } } diff --git a/builtin/k8s/helm/plugin.pb.go b/builtin/k8s/helm/helm.pb.go similarity index 54% rename from builtin/k8s/helm/plugin.pb.go rename to builtin/k8s/helm/helm.pb.go index a48d3d067..edeac5c64 100644 --- a/builtin/k8s/helm/plugin.pb.go +++ b/builtin/k8s/helm/helm.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: helm.proto package helm @@ -32,7 +32,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_helm_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_helm_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_helm_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetRelease() string { @@ -68,36 +68,36 @@ func (x *Deployment) GetRelease() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, - 0x6b, 0x38, 0x73, 0x5f, 0x68, 0x65, 0x6c, 0x6d, 0x22, 0x26, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, - 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, - 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, - 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, - 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6b, 0x38, 0x73, 0x2f, 0x68, 0x65, - 0x6c, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_helm_proto protoreflect.FileDescriptor + +var file_helm_proto_rawDesc = []byte{ + 0x0a, 0x0a, 0x68, 0x65, 0x6c, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x6b, 0x38, + 0x73, 0x5f, 0x68, 0x65, 0x6c, 0x6d, 0x22, 0x26, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, + 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x42, 0x30, + 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, + 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, + 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6b, 0x38, 0x73, 0x2f, 0x68, 0x65, 0x6c, 0x6d, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_helm_proto_rawDescOnce sync.Once + file_helm_proto_rawDescData = file_helm_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_helm_proto_rawDescGZIP() []byte { + file_helm_proto_rawDescOnce.Do(func() { + file_helm_proto_rawDescData = protoimpl.X.CompressGZIP(file_helm_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_helm_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_helm_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_helm_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: k8s_helm.Deployment } -var file_plugin_proto_depIdxs = []int32{ +var file_helm_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -105,13 +105,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_helm_proto_init() } +func file_helm_proto_init() { + if File_helm_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_helm_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -128,18 +128,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_helm_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_helm_proto_goTypes, + DependencyIndexes: file_helm_proto_depIdxs, + MessageInfos: file_helm_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_helm_proto = out.File + file_helm_proto_rawDesc = nil + file_helm_proto_goTypes = nil + file_helm_proto_depIdxs = nil } diff --git a/builtin/k8s/helm/plugin.proto b/builtin/k8s/helm/helm.proto similarity index 100% rename from builtin/k8s/helm/plugin.proto rename to builtin/k8s/helm/helm.proto diff --git a/builtin/k8s/helm/plugin.go b/builtin/k8s/helm/plugin.go index d24de03a5..5bd931163 100644 --- a/builtin/k8s/helm/plugin.go +++ b/builtin/k8s/helm/plugin.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. helm.proto // Options are the SDK options to use for instantiation for the plugin. var Options = []sdk.Option{ diff --git a/builtin/k8s/k8s.go b/builtin/k8s/k8s.go index d883518dd..2a116cf5d 100644 --- a/builtin/k8s/k8s.go +++ b/builtin/k8s/k8s.go @@ -5,7 +5,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. k8s.proto const platformName = "kubernetes" diff --git a/builtin/k8s/plugin.pb.go b/builtin/k8s/k8s.pb.go similarity index 68% rename from builtin/k8s/plugin.pb.go rename to builtin/k8s/k8s.pb.go index b26917de9..5a2c597ad 100644 --- a/builtin/k8s/plugin.pb.go +++ b/builtin/k8s/k8s.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: k8s.proto package k8s @@ -34,7 +34,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_k8s_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -47,7 +47,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_k8s_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -60,7 +60,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_k8s_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetId() string { @@ -98,7 +98,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_k8s_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -111,7 +111,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_k8s_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -124,7 +124,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_k8s_proto_rawDescGZIP(), []int{1} } func (x *Release) GetServiceName() string { @@ -158,7 +158,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_k8s_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -171,7 +171,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_k8s_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -184,7 +184,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2} + return file_k8s_proto_rawDescGZIP(), []int{2} } // This represents the state of the TaskLaunch implementation. @@ -199,7 +199,7 @@ type TaskInfo struct { func (x *TaskInfo) Reset() { *x = TaskInfo{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_k8s_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -212,7 +212,7 @@ func (x *TaskInfo) String() string { func (*TaskInfo) ProtoMessage() {} func (x *TaskInfo) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_k8s_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -225,7 +225,7 @@ func (x *TaskInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskInfo.ProtoReflect.Descriptor instead. func (*TaskInfo) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{3} + return file_k8s_proto_rawDescGZIP(), []int{3} } func (x *TaskInfo) GetId() string { @@ -247,7 +247,7 @@ type Resource_Autoscale struct { func (x *Resource_Autoscale) Reset() { *x = Resource_Autoscale{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_k8s_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -260,7 +260,7 @@ func (x *Resource_Autoscale) String() string { func (*Resource_Autoscale) ProtoMessage() {} func (x *Resource_Autoscale) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[4] + mi := &file_k8s_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -273,7 +273,7 @@ func (x *Resource_Autoscale) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Autoscale.ProtoReflect.Descriptor instead. func (*Resource_Autoscale) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 0} + return file_k8s_proto_rawDescGZIP(), []int{2, 0} } func (x *Resource_Autoscale) GetName() string { @@ -294,7 +294,7 @@ type Resource_Deployment struct { func (x *Resource_Deployment) Reset() { *x = Resource_Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_k8s_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -307,7 +307,7 @@ func (x *Resource_Deployment) String() string { func (*Resource_Deployment) ProtoMessage() {} func (x *Resource_Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[5] + mi := &file_k8s_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -320,7 +320,7 @@ func (x *Resource_Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Deployment.ProtoReflect.Descriptor instead. func (*Resource_Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 1} + return file_k8s_proto_rawDescGZIP(), []int{2, 1} } func (x *Resource_Deployment) GetName() string { @@ -341,7 +341,7 @@ type Resource_Service struct { func (x *Resource_Service) Reset() { *x = Resource_Service{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_k8s_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -354,7 +354,7 @@ func (x *Resource_Service) String() string { func (*Resource_Service) ProtoMessage() {} func (x *Resource_Service) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[6] + mi := &file_k8s_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -367,7 +367,7 @@ func (x *Resource_Service) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Service.ProtoReflect.Descriptor instead. func (*Resource_Service) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 2} + return file_k8s_proto_rawDescGZIP(), []int{2, 2} } func (x *Resource_Service) GetName() string { @@ -388,7 +388,7 @@ type Resource_Ingress struct { func (x *Resource_Ingress) Reset() { *x = Resource_Ingress{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[7] + mi := &file_k8s_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -401,7 +401,7 @@ func (x *Resource_Ingress) String() string { func (*Resource_Ingress) ProtoMessage() {} func (x *Resource_Ingress) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[7] + mi := &file_k8s_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -414,7 +414,7 @@ func (x *Resource_Ingress) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Ingress.ProtoReflect.Descriptor instead. func (*Resource_Ingress) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2, 3} + return file_k8s_proto_rawDescGZIP(), []int{2, 3} } func (x *Resource_Ingress) GetName() string { @@ -424,56 +424,56 @@ func (x *Resource_Ingress) GetName() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, - 0x6b, 0x38, 0x73, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, - 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, - 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, - 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x22, 0x75, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0c, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, - 0x6c, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, - 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x8b, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x1f, 0x0a, 0x09, 0x41, 0x75, 0x74, 0x6f, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x20, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x1d, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x1d, 0x0a, 0x07, 0x49, 0x6e, 0x67, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, - 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6b, 0x38, 0x73, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_k8s_proto protoreflect.FileDescriptor + +var file_k8s_proto_rawDesc = []byte{ + 0x0a, 0x09, 0x6b, 0x38, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x6b, 0x38, 0x73, + 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, + 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, + 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x75, + 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x55, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 0x12, 0x35, + 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, + 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x8b, 0x01, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x1a, 0x1f, 0x0a, 0x09, 0x41, 0x75, 0x74, 0x6f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x1a, 0x20, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, + 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x1d, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x1a, 0x1d, 0x0a, 0x07, 0x49, 0x6e, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, + 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, + 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, + 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6b, 0x38, 0x73, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_k8s_proto_rawDescOnce sync.Once + file_k8s_proto_rawDescData = file_k8s_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_k8s_proto_rawDescGZIP() []byte { + file_k8s_proto_rawDescOnce.Do(func() { + file_k8s_proto_rawDescData = protoimpl.X.CompressGZIP(file_k8s_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_k8s_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_plugin_proto_goTypes = []interface{}{ +var file_k8s_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_k8s_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: k8s.Deployment (*Release)(nil), // 1: k8s.Release (*Resource)(nil), // 2: k8s.Resource @@ -484,7 +484,7 @@ var file_plugin_proto_goTypes = []interface{}{ (*Resource_Ingress)(nil), // 7: k8s.Resource.Ingress (*opaqueany.Any)(nil), // 8: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_k8s_proto_depIdxs = []int32{ 8, // 0: k8s.Deployment.resource_state:type_name -> opaqueany.Any 8, // 1: k8s.Release.resource_state:type_name -> opaqueany.Any 2, // [2:2] is the sub-list for method output_type @@ -494,13 +494,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_k8s_proto_init() } +func file_k8s_proto_init() { + if File_k8s_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -512,7 +512,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -524,7 +524,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -536,7 +536,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskInfo); i { case 0: return &v.state @@ -548,7 +548,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Autoscale); i { case 0: return &v.state @@ -560,7 +560,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Deployment); i { case 0: return &v.state @@ -572,7 +572,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Service); i { case 0: return &v.state @@ -584,7 +584,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_k8s_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Ingress); i { case 0: return &v.state @@ -601,18 +601,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_k8s_proto_rawDesc, NumEnums: 0, NumMessages: 8, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_k8s_proto_goTypes, + DependencyIndexes: file_k8s_proto_depIdxs, + MessageInfos: file_k8s_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_k8s_proto = out.File + file_k8s_proto_rawDesc = nil + file_k8s_proto_goTypes = nil + file_k8s_proto_depIdxs = nil } diff --git a/builtin/k8s/plugin.proto b/builtin/k8s/k8s.proto similarity index 100% rename from builtin/k8s/plugin.proto rename to builtin/k8s/k8s.proto diff --git a/builtin/k8s/task.go b/builtin/k8s/task.go index 7e030b333..15a9e7a9d 100644 --- a/builtin/k8s/task.go +++ b/builtin/k8s/task.go @@ -612,8 +612,6 @@ func (p *TaskLauncher) WatchTask( // Pod is still running, but no log output continue } - - continue } // NOTE(briancain): it doesn't seem like the k8s API is sending an EOF // Maybe some day this will work. diff --git a/builtin/nomad/canary/plugin.pb.go b/builtin/nomad/canary/canary.pb.go similarity index 74% rename from builtin/nomad/canary/plugin.pb.go rename to builtin/nomad/canary/canary.pb.go index 4696d7026..00eb38fe2 100644 --- a/builtin/nomad/canary/plugin.pb.go +++ b/builtin/nomad/canary/canary.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: canary.proto package canary @@ -33,7 +33,7 @@ type Release struct { func (x *Release) Reset() { *x = Release{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_canary_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -46,7 +46,7 @@ func (x *Release) String() string { func (*Release) ProtoMessage() {} func (x *Release) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_canary_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -59,7 +59,7 @@ func (x *Release) ProtoReflect() protoreflect.Message { // Deprecated: Use Release.ProtoReflect.Descriptor instead. func (*Release) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_canary_proto_rawDescGZIP(), []int{0} } func (x *Release) GetUrl() string { @@ -76,10 +76,10 @@ func (x *Release) GetResourceState() *opaqueany.Any { return nil } -var File_plugin_proto protoreflect.FileDescriptor +var File_canary_proto protoreflect.FileDescriptor -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, +var file_canary_proto_rawDesc = []byte{ + 0x0a, 0x0c, 0x63, 0x61, 0x6e, 0x61, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x63, 0x61, 0x6e, 0x61, 0x72, 0x79, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x52, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x01, 0x20, @@ -94,23 +94,23 @@ var file_plugin_proto_rawDesc = []byte{ } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_canary_proto_rawDescOnce sync.Once + file_canary_proto_rawDescData = file_canary_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_canary_proto_rawDescGZIP() []byte { + file_canary_proto_rawDescOnce.Do(func() { + file_canary_proto_rawDescData = protoimpl.X.CompressGZIP(file_canary_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_canary_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_plugin_proto_goTypes = []interface{}{ +var file_canary_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_canary_proto_goTypes = []interface{}{ (*Release)(nil), // 0: canary.Release (*opaqueany.Any)(nil), // 1: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_canary_proto_depIdxs = []int32{ 1, // 0: canary.Release.resource_state:type_name -> opaqueany.Any 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -119,13 +119,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_canary_proto_init() } +func file_canary_proto_init() { + if File_canary_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_canary_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Release); i { case 0: return &v.state @@ -142,18 +142,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_canary_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_canary_proto_goTypes, + DependencyIndexes: file_canary_proto_depIdxs, + MessageInfos: file_canary_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_canary_proto = out.File + file_canary_proto_rawDesc = nil + file_canary_proto_goTypes = nil + file_canary_proto_depIdxs = nil } diff --git a/builtin/nomad/canary/plugin.proto b/builtin/nomad/canary/canary.proto similarity index 100% rename from builtin/nomad/canary/plugin.proto rename to builtin/nomad/canary/canary.proto diff --git a/builtin/nomad/canary/plugin.go b/builtin/nomad/canary/plugin.go index 94a3e5790..8a969fbbf 100644 --- a/builtin/nomad/canary/plugin.go +++ b/builtin/nomad/canary/plugin.go @@ -4,7 +4,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. canary.proto // Options are the SDK options to use for instantiation for // the Nomad plugin. diff --git a/builtin/nomad/jobspec/plugin.pb.go b/builtin/nomad/jobspec/jobspec.pb.go similarity index 61% rename from builtin/nomad/jobspec/plugin.pb.go rename to builtin/nomad/jobspec/jobspec.pb.go index 47434f3d3..637361cba 100644 --- a/builtin/nomad/jobspec/plugin.pb.go +++ b/builtin/nomad/jobspec/jobspec.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: jobspec.proto package jobspec @@ -34,7 +34,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_jobspec_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -47,7 +47,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_jobspec_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -60,7 +60,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_jobspec_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetId() string { @@ -94,7 +94,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_jobspec_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -107,7 +107,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_jobspec_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -120,7 +120,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_jobspec_proto_rawDescGZIP(), []int{1} } type Resource_Job struct { @@ -136,7 +136,7 @@ type Resource_Job struct { func (x *Resource_Job) Reset() { *x = Resource_Job{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_jobspec_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -149,7 +149,7 @@ func (x *Resource_Job) String() string { func (*Resource_Job) ProtoMessage() {} func (x *Resource_Job) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_jobspec_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -162,7 +162,7 @@ func (x *Resource_Job) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Job.ProtoReflect.Descriptor instead. func (*Resource_Job) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1, 0} + return file_jobspec_proto_rawDescGZIP(), []int{1, 0} } func (x *Resource_Job) GetName() string { @@ -186,50 +186,50 @@ func (x *Resource_Job) GetNamespace() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, - 0x6a, 0x6f, 0x62, 0x73, 0x70, 0x65, 0x63, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, - 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0a, - 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, - 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, - 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x53, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x1a, 0x47, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, - 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, - 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, - 0x74, 0x69, 0x6e, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x64, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x70, 0x65, - 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_jobspec_proto protoreflect.FileDescriptor + +var file_jobspec_proto_rawDesc = []byte{ + 0x0a, 0x0d, 0x6a, 0x6f, 0x62, 0x73, 0x70, 0x65, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, + 0x07, 0x6a, 0x6f, 0x62, 0x73, 0x70, 0x65, 0x63, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, + 0x61, 0x6e, 0x79, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, + 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x35, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, + 0x61, 0x6e, 0x79, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x53, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x1a, 0x47, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, 0x0a, + 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, + 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, + 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x64, 0x2f, 0x6a, 0x6f, 0x62, 0x73, 0x70, + 0x65, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_jobspec_proto_rawDescOnce sync.Once + file_jobspec_proto_rawDescData = file_jobspec_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_jobspec_proto_rawDescGZIP() []byte { + file_jobspec_proto_rawDescOnce.Do(func() { + file_jobspec_proto_rawDescData = protoimpl.X.CompressGZIP(file_jobspec_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_jobspec_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_plugin_proto_goTypes = []interface{}{ +var file_jobspec_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_jobspec_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: jobspec.Deployment (*Resource)(nil), // 1: jobspec.Resource (*Resource_Job)(nil), // 2: jobspec.Resource.Job (*opaqueany.Any)(nil), // 3: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_jobspec_proto_depIdxs = []int32{ 3, // 0: jobspec.Deployment.resource_state:type_name -> opaqueany.Any 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -238,13 +238,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_jobspec_proto_init() } +func file_jobspec_proto_init() { + if File_jobspec_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_jobspec_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -256,7 +256,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_jobspec_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -268,7 +268,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_jobspec_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Job); i { case 0: return &v.state @@ -285,18 +285,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_jobspec_proto_rawDesc, NumEnums: 0, NumMessages: 3, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_jobspec_proto_goTypes, + DependencyIndexes: file_jobspec_proto_depIdxs, + MessageInfos: file_jobspec_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_jobspec_proto = out.File + file_jobspec_proto_rawDesc = nil + file_jobspec_proto_goTypes = nil + file_jobspec_proto_depIdxs = nil } diff --git a/builtin/nomad/jobspec/plugin.proto b/builtin/nomad/jobspec/jobspec.proto similarity index 100% rename from builtin/nomad/jobspec/plugin.proto rename to builtin/nomad/jobspec/jobspec.proto diff --git a/builtin/nomad/jobspec/plugin.go b/builtin/nomad/jobspec/plugin.go index ab7346d6b..9deda4c7b 100644 --- a/builtin/nomad/jobspec/plugin.go +++ b/builtin/nomad/jobspec/plugin.go @@ -4,7 +4,7 @@ import ( sdk "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. jobspec.proto // Options are the SDK options to use for instantiation for // the Nomad plugin. diff --git a/builtin/nomad/nomad.go b/builtin/nomad/nomad.go index 394cae34d..568c28485 100644 --- a/builtin/nomad/nomad.go +++ b/builtin/nomad/nomad.go @@ -2,7 +2,7 @@ package nomad import sdk "github.com/nomatronio/derrick-plugin-sdk" -//go:generate protoc -I. -I../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. -I../../thirdparty/proto --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. nomad.proto // Options are the SDK options to use for instantiation for // the Nomad plugin. diff --git a/builtin/nomad/plugin.pb.go b/builtin/nomad/nomad.pb.go similarity index 64% rename from builtin/nomad/plugin.pb.go rename to builtin/nomad/nomad.pb.go index 90455b4f9..3fa8e61ac 100644 --- a/builtin/nomad/plugin.pb.go +++ b/builtin/nomad/nomad.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: nomad.proto package nomad @@ -34,7 +34,7 @@ type Deployment struct { func (x *Deployment) Reset() { *x = Deployment{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_nomad_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -47,7 +47,7 @@ func (x *Deployment) String() string { func (*Deployment) ProtoMessage() {} func (x *Deployment) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_nomad_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -60,7 +60,7 @@ func (x *Deployment) ProtoReflect() protoreflect.Message { // Deprecated: Use Deployment.ProtoReflect.Descriptor instead. func (*Deployment) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_nomad_proto_rawDescGZIP(), []int{0} } func (x *Deployment) GetId() string { @@ -94,7 +94,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_nomad_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -107,7 +107,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[1] + mi := &file_nomad_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -120,7 +120,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1} + return file_nomad_proto_rawDescGZIP(), []int{1} } // This represents the state of the TaskLaunch implementation. @@ -135,7 +135,7 @@ type TaskInfo struct { func (x *TaskInfo) Reset() { *x = TaskInfo{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_nomad_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -148,7 +148,7 @@ func (x *TaskInfo) String() string { func (*TaskInfo) ProtoMessage() {} func (x *TaskInfo) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[2] + mi := &file_nomad_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -161,7 +161,7 @@ func (x *TaskInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskInfo.ProtoReflect.Descriptor instead. func (*TaskInfo) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{2} + return file_nomad_proto_rawDescGZIP(), []int{2} } func (x *TaskInfo) GetId() string { @@ -182,7 +182,7 @@ type Resource_Job struct { func (x *Resource_Job) Reset() { *x = Resource_Job{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_nomad_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -195,7 +195,7 @@ func (x *Resource_Job) String() string { func (*Resource_Job) ProtoMessage() {} func (x *Resource_Job) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[3] + mi := &file_nomad_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -208,7 +208,7 @@ func (x *Resource_Job) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Job.ProtoReflect.Descriptor instead. func (*Resource_Job) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{1, 0} + return file_nomad_proto_rawDescGZIP(), []int{1, 0} } func (x *Resource_Job) GetName() string { @@ -218,49 +218,49 @@ func (x *Resource_Job) GetName() string { return "" } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, - 0x6e, 0x6f, 0x6d, 0x61, 0x64, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, - 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0a, 0x44, 0x65, - 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0e, - 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, - 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x22, 0x25, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, - 0x19, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x08, 0x54, 0x61, - 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, - 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, - 0x6e, 0x6f, 0x6d, 0x61, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_nomad_proto protoreflect.FileDescriptor + +var file_nomad_proto_rawDesc = []byte{ + 0x0a, 0x0b, 0x6e, 0x6f, 0x6d, 0x61, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x6e, + 0x6f, 0x6d, 0x61, 0x64, 0x1a, 0x13, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2f, + 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x67, 0x0a, 0x0a, 0x44, 0x65, 0x70, + 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x0e, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x61, 0x6e, 0x79, 0x2e, + 0x41, 0x6e, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x22, 0x25, 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x1a, 0x19, + 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, + 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, + 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x6e, + 0x6f, 0x6d, 0x61, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_nomad_proto_rawDescOnce sync.Once + file_nomad_proto_rawDescData = file_nomad_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_nomad_proto_rawDescGZIP() []byte { + file_nomad_proto_rawDescOnce.Do(func() { + file_nomad_proto_rawDescData = protoimpl.X.CompressGZIP(file_nomad_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_nomad_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_plugin_proto_goTypes = []interface{}{ +var file_nomad_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_nomad_proto_goTypes = []interface{}{ (*Deployment)(nil), // 0: nomad.Deployment (*Resource)(nil), // 1: nomad.Resource (*TaskInfo)(nil), // 2: nomad.TaskInfo (*Resource_Job)(nil), // 3: nomad.Resource.Job (*opaqueany.Any)(nil), // 4: opaqueany.Any } -var file_plugin_proto_depIdxs = []int32{ +var file_nomad_proto_depIdxs = []int32{ 4, // 0: nomad.Deployment.resource_state:type_name -> opaqueany.Any 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -269,13 +269,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_nomad_proto_init() } +func file_nomad_proto_init() { + if File_nomad_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_nomad_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Deployment); i { case 0: return &v.state @@ -287,7 +287,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_nomad_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource); i { case 0: return &v.state @@ -299,7 +299,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_nomad_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskInfo); i { case 0: return &v.state @@ -311,7 +311,7 @@ func file_plugin_proto_init() { return nil } } - file_plugin_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_nomad_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Job); i { case 0: return &v.state @@ -328,18 +328,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_nomad_proto_rawDesc, NumEnums: 0, NumMessages: 4, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_nomad_proto_goTypes, + DependencyIndexes: file_nomad_proto_depIdxs, + MessageInfos: file_nomad_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_nomad_proto = out.File + file_nomad_proto_rawDesc = nil + file_nomad_proto_goTypes = nil + file_nomad_proto_depIdxs = nil } diff --git a/builtin/nomad/plugin.proto b/builtin/nomad/nomad.proto similarity index 100% rename from builtin/nomad/plugin.proto rename to builtin/nomad/nomad.proto diff --git a/builtin/pack/builder.go b/builtin/pack/builder.go index 32d9ec67d..1339e614e 100644 --- a/builtin/pack/builder.go +++ b/builtin/pack/builder.go @@ -395,7 +395,7 @@ func (b *Builder) Build( }, }, DefaultProcessType: b.config.ProcessType, - TrustBuilder: func(string) bool { return true }, + TrustBuilder: func(string) bool { return true }, } err = client.Build(ctx, bo) diff --git a/builtin/pack/main.go b/builtin/pack/main.go index 22782f14b..b2f3815f0 100644 --- a/builtin/pack/main.go +++ b/builtin/pack/main.go @@ -4,7 +4,7 @@ import ( "github.com/nomatronio/derrick-plugin-sdk" ) -//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. plugin.proto +//go:generate protoc -I. --go_out=paths=source_relative:. --go-grpc_out=paths=source_relative:. pack.proto // Options are the SDK options to use for instantiation. var Options = []sdk.Option{ diff --git a/builtin/pack/plugin.pb.go b/builtin/pack/pack.pb.go similarity index 52% rename from builtin/pack/plugin.pb.go rename to builtin/pack/pack.pb.go index 2cc15ac67..fda5657f4 100644 --- a/builtin/pack/plugin.pb.go +++ b/builtin/pack/pack.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v7.34.0 -// source: plugin.proto +// protoc v7.35.1 +// source: pack.proto package pack @@ -35,7 +35,7 @@ type DockerImage struct { func (x *DockerImage) Reset() { *x = DockerImage{} if protoimpl.UnsafeEnabled { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_pack_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -48,7 +48,7 @@ func (x *DockerImage) String() string { func (*DockerImage) ProtoMessage() {} func (x *DockerImage) ProtoReflect() protoreflect.Message { - mi := &file_plugin_proto_msgTypes[0] + mi := &file_pack_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -61,7 +61,7 @@ func (x *DockerImage) ProtoReflect() protoreflect.Message { // Deprecated: Use DockerImage.ProtoReflect.Descriptor instead. func (*DockerImage) Descriptor() ([]byte, []int) { - return file_plugin_proto_rawDescGZIP(), []int{0} + return file_pack_proto_rawDescGZIP(), []int{0} } func (x *DockerImage) GetImage() string { @@ -92,48 +92,47 @@ func (x *DockerImage) GetRemote() bool { return false } -var File_plugin_proto protoreflect.FileDescriptor - -var file_plugin_proto_rawDesc = []byte{ - 0x0a, 0x0c, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, - 0x70, 0x61, 0x63, 0x6b, 0x22, 0xd4, 0x01, 0x0a, 0x0b, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, - 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x45, 0x0a, 0x0c, - 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x2e, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x2e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x1a, 0x3e, 0x0a, 0x10, 0x42, - 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2c, 0x5a, 0x2a, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, - 0x6f, 0x6e, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, - 0x6c, 0x74, 0x69, 0x6e, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, +var File_pack_proto protoreflect.FileDescriptor + +var file_pack_proto_rawDesc = []byte{ + 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x70, 0x61, + 0x63, 0x6b, 0x22, 0xd4, 0x01, 0x0a, 0x0b, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x45, 0x0a, 0x0c, 0x62, 0x75, + 0x69, 0x6c, 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x22, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x2e, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x2e, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x73, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x1a, 0x3e, 0x0a, 0x10, 0x42, 0x75, 0x69, + 0x6c, 0x64, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x6d, 0x61, 0x74, 0x72, 0x6f, 0x6e, + 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x72, 0x72, 0x69, 0x63, 0x6b, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x74, + 0x69, 0x6e, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_plugin_proto_rawDescOnce sync.Once - file_plugin_proto_rawDescData = file_plugin_proto_rawDesc + file_pack_proto_rawDescOnce sync.Once + file_pack_proto_rawDescData = file_pack_proto_rawDesc ) -func file_plugin_proto_rawDescGZIP() []byte { - file_plugin_proto_rawDescOnce.Do(func() { - file_plugin_proto_rawDescData = protoimpl.X.CompressGZIP(file_plugin_proto_rawDescData) +func file_pack_proto_rawDescGZIP() []byte { + file_pack_proto_rawDescOnce.Do(func() { + file_pack_proto_rawDescData = protoimpl.X.CompressGZIP(file_pack_proto_rawDescData) }) - return file_plugin_proto_rawDescData + return file_pack_proto_rawDescData } -var file_plugin_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_plugin_proto_goTypes = []interface{}{ +var file_pack_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_pack_proto_goTypes = []interface{}{ (*DockerImage)(nil), // 0: pack.DockerImage nil, // 1: pack.DockerImage.BuildLabelsEntry } -var file_plugin_proto_depIdxs = []int32{ +var file_pack_proto_depIdxs = []int32{ 1, // 0: pack.DockerImage.build_labels:type_name -> pack.DockerImage.BuildLabelsEntry 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -142,13 +141,13 @@ var file_plugin_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_plugin_proto_init() } -func file_plugin_proto_init() { - if File_plugin_proto != nil { +func init() { file_pack_proto_init() } +func file_pack_proto_init() { + if File_pack_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_plugin_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pack_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DockerImage); i { case 0: return &v.state @@ -165,18 +164,18 @@ func file_plugin_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_plugin_proto_rawDesc, + RawDescriptor: file_pack_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_plugin_proto_goTypes, - DependencyIndexes: file_plugin_proto_depIdxs, - MessageInfos: file_plugin_proto_msgTypes, + GoTypes: file_pack_proto_goTypes, + DependencyIndexes: file_pack_proto_depIdxs, + MessageInfos: file_pack_proto_msgTypes, }.Build() - File_plugin_proto = out.File - file_plugin_proto_rawDesc = nil - file_plugin_proto_goTypes = nil - file_plugin_proto_depIdxs = nil + File_pack_proto = out.File + file_pack_proto_rawDesc = nil + file_pack_proto_goTypes = nil + file_pack_proto_depIdxs = nil } diff --git a/builtin/pack/plugin.proto b/builtin/pack/pack.proto similarity index 100% rename from builtin/pack/plugin.proto rename to builtin/pack/pack.proto diff --git a/docs/security/vuln-triage.md b/docs/security/vuln-triage.md new file mode 100644 index 000000000..b9115c924 --- /dev/null +++ b/docs/security/vuln-triage.md @@ -0,0 +1,50 @@ +# Vulnerability Triage (Foundation Hardening) + +This document records vulnerability findings from `govulncheck` that are intentionally deferred during the foundation hardening phase. Tier-3b modules were bumped where a clear fixed version exists and tests pass. + +## Fixed in foundation hardening (tier 3b) + +| Module | Previous | Updated | Notes | +|--------|----------|---------|-------| +| `google.golang.org/grpc` | v1.50.1 | v1.56.3 | Stepwise bump (GO-2023-2153); v1.79+ deferred — breaks TLS serverclient tests until test/server TLS config is updated | +| `golang.org/x/text` | v0.7.0 | v0.39.0 | Direct bump | +| `golang.org/x/net` | v0.1.0 (SDK) | v0.23.0 | Bumped in SDK | +| `github.com/go-git/go-git/v5` | v5.2.0 | v5.19.1 | Git datasource paths | +| `github.com/opencontainers/runc` | v1.1.5 | v1.3.6 | Indirect dep | +| `github.com/distribution/distribution/v3` | pseudo-version | N/A | Migrated `internal/installutil` to `github.com/distribution/reference` | + +## Deferred (track per-plugin / modernization) + +### `google.golang.org/grpc` (v1.57+) + +- **Rationale:** v1.80+ causes `pkg/serverclient` TLS integration test failures (gRPC dial timeout with self-signed certs). Requires follow-up to set `NextProtos: []string{"h2"}` on test TLS configs and validate production server TLS before further bumps. +- **Impact:** Server client connection paths. + +### `github.com/docker/docker` + +- **Rationale:** Large API surface; Dependabot ignored in this repo. Fix during Docker plugin extraction and modernization. +- **Impact:** Docker builder/platform builtins. + +### `github.com/containerd/containerd` + +- **Rationale:** Indirect via Docker/buildpacks; no simple patch without Docker ecosystem upgrade. +- **Impact:** Container build paths (pack, docker). + +### `golang.org/x/crypto` (openpgp) + +- **Rationale:** openpgp package is unmaintained; findings trace via Helm chart verify and go-git init. No drop-in fixed version. +- **Impact:** Helm and git-related verification paths. + +### `k8s.io/*` (client-go, apimachinery, etc.) + +- **Rationale:** Major version migration; Dependabot explicitly defers k8s bumps. Address during Kubernetes plugin modernization. +- **Impact:** k8s, k8s/apply, k8s/helm builtins. + +### `github.com/docker/distribution` (v2) + +- **Rationale:** Legacy v2 module still used by several builtins for `reference` parsing. Separate from `distribution/v3`; migrate to `github.com/distribution/reference` incrementally. +- **Impact:** docker, k8s, pack, azure/aci reference validation. + +## CI + +`govulncheck ./...` runs on every PR in `.github/workflows/go-tests.yml` (derrick and derrick-plugin-sdk). New high-severity findings in tier-3b scope should be fixed or added here with rationale before merging. diff --git a/go.mod b/go.mod index 214878955..9c8d1d97a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/nomatronio/derrick -go 1.19 +go 1.25.0 require ( contrib.go.opencensus.io/exporter/ocagent v0.6.0 @@ -11,26 +11,26 @@ require ( github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20210527074920-9baf37265e83 github.com/adrg/xdg v0.2.1 github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 - github.com/aws/aws-sdk-go v1.44.269 + github.com/aws/aws-sdk-go v1.55.5 github.com/bmatcuk/doublestar v1.1.5 github.com/buildpacks/pack v0.24.1 github.com/cenkalti/backoff/v4 v4.1.2 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 - github.com/containerd/console v1.0.3 + github.com/containerd/console v1.0.5 github.com/creack/pty v1.1.11 - github.com/davecgh/go-spew v1.1.1 - github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269 + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc + github.com/distribution/reference v0.6.0 github.com/docker/cli v20.10.17+incompatible github.com/docker/distribution v2.8.1+incompatible github.com/docker/docker v20.10.17+incompatible github.com/docker/go-connections v0.4.0 - github.com/docker/go-units v0.4.0 + github.com/docker/go-units v0.5.0 github.com/dustin/go-humanize v1.0.0 github.com/elazarl/go-bindata-assetfs v1.0.1 github.com/fatih/color v1.13.0 github.com/fsnotify/fsnotify v1.5.4 - github.com/gliderlabs/ssh v0.3.1 - github.com/go-git/go-git/v5 v5.2.0 + github.com/gliderlabs/ssh v0.3.8 + github.com/go-git/go-git/v5 v5.19.1 github.com/go-openapi/errors v0.20.3 github.com/go-openapi/runtime v0.19.24 github.com/go-openapi/strfmt v0.21.3 @@ -39,17 +39,17 @@ require ( github.com/go-ozzo/ozzo-validation/v4 v4.2.1 github.com/go-playground/validator v9.31.0+incompatible github.com/gofrs/flock v0.8.1 - github.com/golang/protobuf v1.5.2 - github.com/google/go-cmp v0.5.9 + github.com/golang/protobuf v1.5.4 + github.com/google/go-cmp v0.7.0 github.com/google/go-containerregistry v0.8.0 github.com/google/go-github v17.0.0+incompatible github.com/google/go-jsonnet v0.17.0 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 - github.com/google/uuid v1.3.0 - github.com/gorilla/handlers v1.5.1 - github.com/gorilla/mux v1.8.0 + github.com/google/uuid v1.6.0 + github.com/gorilla/handlers v1.5.2 + github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 github.com/hashicorp/aws-sdk-go-base v0.7.0 github.com/hashicorp/cap v0.1.1 github.com/hashicorp/consul/api v1.15.2 @@ -96,27 +96,27 @@ require ( github.com/oklog/ulid/v2 v2.0.2 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/go-digest v1.0.0 - github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 + github.com/opencontainers/image-spec v1.1.1 github.com/pkg/errors v0.9.1 github.com/posener/complete v1.2.3 github.com/r3labs/diff v1.1.0 github.com/sebdah/goldie/v2 v2.5.3 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/slack-go/slack v0.6.5 - github.com/stretchr/testify v1.8.1 + github.com/stretchr/testify v1.11.1 github.com/vektra/mockery/v2 v2.15.0 github.com/zclconf/go-cty v1.8.4 github.com/zclconf/go-cty-yaml v1.0.2 go.etcd.io/bbolt v1.3.6 go.opencensus.io v0.24.0 - go.uber.org/goleak v1.1.12 - golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d - golang.org/x/oauth2 v0.1.0 - golang.org/x/sys v0.5.0 - google.golang.org/api v0.103.0 - google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c - google.golang.org/grpc v1.50.1 - google.golang.org/protobuf v1.28.1 + go.uber.org/goleak v1.3.0 + golang.org/x/crypto v0.53.0 + golang.org/x/oauth2 v0.36.0 + golang.org/x/sys v0.46.0 + google.golang.org/api v0.134.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 + google.golang.org/grpc v1.56.3 + google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.9.4 k8s.io/api v0.24.2 @@ -128,11 +128,12 @@ require ( ) require ( - cloud.google.com/go v0.105.0 // indirect - cloud.google.com/go/compute v1.12.1 // indirect - cloud.google.com/go/compute/metadata v0.2.1 // indirect - cloud.google.com/go/iam v0.8.0 // indirect - cloud.google.com/go/storage v1.27.0 // indirect + cloud.google.com/go v0.110.9 // indirect + cloud.google.com/go/compute/metadata v0.9.0 // indirect + cloud.google.com/go/iam v1.1.3 // indirect + cloud.google.com/go/storage v1.33.0 // indirect + cyphar.com/go-pathrs v0.2.1 // indirect + dario.cat/mergo v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect @@ -141,7 +142,7 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/BurntSushi/toml v1.0.0 // indirect + github.com/BurntSushi/toml v1.4.0 // indirect github.com/DataDog/datadog-go v3.5.0+incompatible // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect github.com/Masterminds/goutils v1.1.1 // indirect @@ -150,12 +151,13 @@ require ( github.com/Masterminds/sprig v2.22.0+incompatible // indirect github.com/Masterminds/sprig/v3 v3.2.2 // indirect github.com/Masterminds/squirrel v1.5.3 // indirect - github.com/Microsoft/go-winio v0.5.2 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Microsoft/hcsshim v0.9.3 // indirect + github.com/ProtonMail/go-crypto v1.1.6 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/VividCortex/ewma v1.1.1 // indirect - github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect + github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/apex/log v1.9.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/armon/go-metrics v0.3.10 // indirect @@ -169,35 +171,36 @@ require ( github.com/buildpacks/lifecycle v0.13.3 // indirect github.com/caddyserver/certmagic v0.10.3 // indirect github.com/cenkalti/backoff/v3 v3.0.0 // indirect - github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect github.com/cheggaaa/pb/v3 v3.0.5 // indirect + github.com/cloudflare/circl v1.6.3 // indirect github.com/containerd/cgroups v1.0.3 // indirect github.com/containerd/containerd v1.6.6 // indirect github.com/containerd/stargz-snapshotter/estargz v0.10.1 // indirect github.com/containerd/typeurl v1.0.2 // indirect github.com/coreos/go-oidc/v3 v3.0.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect + github.com/cyphar/filepath-securejoin v0.6.1 // indirect github.com/dimchansky/utfbom v1.1.0 // indirect - github.com/docker/docker-credential-helpers v0.6.4 // indirect + github.com/docker/docker-credential-helpers v0.9.5 // indirect github.com/docker/go-metrics v0.0.1 // indirect github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0 // indirect github.com/emicklei/go-restful/v3 v3.8.0 // indirect - github.com/emirpasic/gods v1.12.0 // indirect - github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect github.com/gdamore/encoding v1.0.0 // indirect github.com/gdamore/tcell/v2 v2.4.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-acme/lego/v3 v3.5.0 // indirect github.com/go-errors/errors v1.0.1 // indirect - github.com/go-git/gcfg v1.5.0 // indirect - github.com/go-git/go-billy/v5 v5.0.0 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.9.0 // indirect github.com/go-gorp/gorp/v3 v3.0.2 // indirect - github.com/go-logr/logr v1.2.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-openapi/analysis v0.20.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect @@ -210,15 +213,16 @@ require ( github.com/golang-jwt/jwt/v4 v4.2.0 // indirect github.com/golang-migrate/migrate/v4 v4.10.0 // indirect github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5 // indirect - github.com/golang/glog v1.0.0 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/glog v1.2.5 // indirect + github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.0.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/google/s2a-go v0.1.5 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gookit/color v1.3.1 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/gosuri/uitable v0.0.4 // indirect @@ -242,8 +246,8 @@ require ( github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 // indirect github.com/heroku/color v0.0.6 // indirect github.com/huandu/xstrings v1.3.2 // indirect - github.com/iancoleman/strcase v0.2.0 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/iancoleman/strcase v0.3.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jinzhu/gorm v1.9.12 // indirect github.com/jinzhu/inflection v1.0.0 // indirect @@ -251,10 +255,11 @@ require ( github.com/jmoiron/sqlx v1.3.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect - github.com/klauspost/compress v1.15.11 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/klauspost/compress v1.18.4 // indirect github.com/klauspost/cpuid v1.2.3 // indirect - github.com/kr/pretty v0.3.0 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/lab47/vterm v0.0.0-20201001232628-a9dd795f94c2 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect @@ -266,7 +271,6 @@ require ( github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/dns v1.1.41 // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect github.com/mitchellh/go-server-timing v1.0.0 // indirect @@ -274,8 +278,9 @@ require ( github.com/moby/locker v1.0.1 // indirect github.com/moby/spdystream v0.2.0 // indirect github.com/moby/sys/mount v0.2.0 // indirect - github.com/moby/sys/mountinfo v0.5.0 // indirect + github.com/moby/sys/mountinfo v0.7.2 // indirect github.com/moby/sys/symlink v0.2.0 // indirect + github.com/moby/sys/user v0.3.0 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -283,8 +288,8 @@ require ( github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect - github.com/opencontainers/runc v1.1.5 // indirect - github.com/opencontainers/selinux v1.10.1 // indirect + github.com/opencontainers/runc v1.3.6 // indirect + github.com/opencontainers/selinux v1.13.1 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/oschwald/geoip2-golang v1.4.0 // indirect github.com/oschwald/maxminddb-golang v1.6.0 // indirect @@ -294,35 +299,37 @@ require ( github.com/philhofer/fwd v1.0.0 // indirect github.com/pierrec/lz4 v2.5.2+incompatible // indirect github.com/pierrec/lz4/v3 v3.3.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.12.1 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/pjbgf/sha1cd v0.6.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.23.2 // indirect + github.com/prometheus/client_model v0.6.2 // indirect + github.com/prometheus/common v0.67.5 // indirect + github.com/prometheus/procfs v0.20.1 // indirect github.com/rivo/tview v0.0.0-20210624165335-29d673af0ce2 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/rogpeppe/go-internal v1.8.0 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/rs/zerolog v1.27.0 // indirect github.com/rubenv/sql-migrate v1.1.1 // indirect - github.com/russross/blackfriday v1.5.2 // indirect + github.com/russross/blackfriday v1.6.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect - github.com/sergi/go-diff v1.1.0 // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/shopspring/decimal v1.2.0 // indirect - github.com/sirupsen/logrus v1.8.1 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/sirupsen/logrus v1.9.4 // indirect + github.com/skeema/knownhosts v1.3.1 // indirect + github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.4.0 // indirect + github.com/spf13/cobra v1.10.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/pflag v1.0.10 // indirect github.com/spf13/viper v1.12.0 // indirect github.com/src-d/gcfg v1.4.0 // indirect - github.com/stretchr/objx v0.5.0 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.4.0 // indirect github.com/tinylib/msgp v1.1.2 // indirect github.com/tj/go-spin v1.1.0 // indirect github.com/ulikunitz/xz v0.5.10 // indirect github.com/vbatts/tar-split v0.11.2 // indirect - github.com/xanzy/ssh-agent v0.3.0 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect @@ -330,16 +337,19 @@ require ( github.com/y0ssar1an/q v1.0.7 // indirect go.mongodb.org/mongo-driver v1.11.0 // indirect go.starlark.net v0.0.0-20200707032745-474f21a9602d // indirect - go.uber.org/atomic v1.9.0 // indirect - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.1.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/tools v0.1.12 // indirect + go.uber.org/atomic v1.10.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.56.0 // indirect + golang.org/x/sync v0.21.0 // indirect + golang.org/x/term v0.44.0 // indirect + golang.org/x/text v0.39.0 // indirect + golang.org/x/time v0.14.0 // indirect + golang.org/x/tools v0.47.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect gopkg.in/DataDog/dd-trace-go.v1 v1.27.0 // indirect gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index aa6046902..e6cd52911 100644 --- a/go.sum +++ b/go.sum @@ -25,7 +25,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -42,8 +41,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y= -cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= +cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68= +cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -80,10 +79,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= -cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= -cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= -cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= +cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs= +cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= @@ -123,13 +120,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.8.0 h1:E2osAkZzxI/+8pZcxVLcDtAQx/u+hZXVryUaYQ5O0Kk= -cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= +cloud.google.com/go/iam v1.1.3 h1:18tKG7DzydKWUnLjonWcJO6wjSCAtzh4GcRKlH/Hrzc= +cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -184,11 +180,11 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= -cloud.google.com/go/storage v1.27.0 h1:YOO045NZI9RKfCj1c5A/ZtuuENUc8OAW+gHdGnDgyMQ= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= +cloud.google.com/go/storage v1.33.0 h1:PVrDOkIC8qQVa1P3SXGpQvfuJhN2LHOoyZvWs8D2X5M= +cloud.google.com/go/storage v1.33.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -210,6 +206,10 @@ contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeS contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= +cyphar.com/go-pathrs v0.2.1 h1:9nx1vOgwVvX1mNBWDu93+vaceedpbsDqo+XuBGL40b8= +cyphar.com/go-pathrs v0.2.1/go.mod h1:y8f1EMG7r+hCuFf/rXsKqMJrJAUoADZGNh5/vZPKcGc= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= @@ -292,12 +292,14 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.5.0+incompatible h1:AShr9cqkF+taHjyQgcBcQUt/ZNK+iPq4ROaZwSX5c/U= github.com/DataDog/datadog-go v3.5.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -335,8 +337,9 @@ github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JP github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= @@ -357,6 +360,8 @@ github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMo github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= +github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw= +github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= @@ -391,8 +396,9 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -447,8 +453,8 @@ github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU github.com/aws/aws-sdk-go v1.33.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.269 h1:NUNq++KMjhWUVVUIx7HYLgBpX16bWfTY1EdQRraLALo= -github.com/aws/aws-sdk-go v1.44.269/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= @@ -485,6 +491,7 @@ github.com/briandowns/spinner v1.11.1 h1:OixPqDEcX3juo5AjQZAnFPbeUA0jvkp2qzB5gOZ github.com/briandowns/spinner v1.11.1/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= @@ -511,20 +518,21 @@ github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuD github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5PW5zdZ39xEwfS9an067BirqA+P4QaLI= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/cheggaaa/pb/v3 v3.0.5 h1:lmZOti7CraK9RSjzExsY53+WWfub9Qv13B5m4ptEoPE= github.com/cheggaaa/pb/v3 v3.0.5/go.mod h1:X1L61/+36nz9bjIsrDU52qHKOQukUQe2Ge+YvGuquCw= @@ -536,10 +544,11 @@ github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLI github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= +github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -581,8 +590,8 @@ github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4g github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc= +github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= @@ -612,6 +621,7 @@ github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= github.com/containerd/continuity v0.2.2 h1:QSqfxcn8c+12slxwu00AtzXrsami0MJb/MQs9lOLHLA= +github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= @@ -689,13 +699,14 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE= +github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc= github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= @@ -704,8 +715,9 @@ github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjI github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= @@ -724,6 +736,8 @@ github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TR github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269 h1:hbCT8ZPPMqefiAWD2ZKjn7ypokIGViTvBBg/ExLSdCk= github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnsimple/dnsimple-go v0.30.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg= @@ -755,8 +769,9 @@ github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05 github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/docker-credential-helpers v0.6.4 h1:axCks+yV+2MR3/kZhAmy07yC56WZ2Pwu/fKWtKuZB0o= github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c= +github.com/docker/docker-credential-helpers v0.9.5 h1:EFNN8DHvaiK8zVqFA2DT6BjXE0GzfLOZ38ggPTKePkY= +github.com/docker/docker-credential-helpers v0.9.5/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= @@ -766,8 +781,9 @@ github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libnetwork v0.8.0-dev.2.0.20200917202933-d0951081b35f/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= @@ -785,14 +801,16 @@ github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw= github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o= +github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -804,8 +822,9 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2 h1:JiO+kJTpmYGjEodY7O1Zk8oZcNz1+f30UtwtXoFUPzE= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= +github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds= +github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/evanphx/grpc-gateway v1.16.1-0.20220211183845-48e5be386c15 h1:Zv4QDjhr0dasDSd+px/sUc5kVWOnZ+qoSa4KGPkjgRw= @@ -827,9 +846,9 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.0/go.mod h1:3+D9sFq0ahK/JeJPhCBUV1xlf4/eIYrUQaxulT0VzX8= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -839,6 +858,7 @@ github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60 github.com/frankban/quicktest v1.4.1/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= @@ -865,8 +885,8 @@ github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/gliderlabs/ssh v0.3.1 h1:L6VrMUGZaMlNIMN8Hj+CHh4U9yodJE3FAt/rgvfaKvE= -github.com/gliderlabs/ssh v0.3.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c= +github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M= @@ -877,14 +897,14 @@ github.com/go-critic/go-critic v0.4.1/go.mod h1:7/14rZGnZbY6E38VEGk2kVhoq6itzc1E github.com/go-critic/go-critic v0.4.3/go.mod h1:j4O3D4RoIwRqlZw5jJpx0BNfXWWbpcJoKu5cYSe4YmQ= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= -github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= -github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= -github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M= -github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= -github.com/go-git/go-git/v5 v5.2.0 h1:YPBLG/3UK1we1ohRkncLjaXWLW+HKp5QNM/jTli2JgI= -github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA= +github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= +github.com/go-git/go-git/v5 v5.19.1 h1:nX27AnaU43/K5bKktKwgBmR9lawoYVe1Ckg0rgzzN00= +github.com/go-git/go-git/v5 v5.19.1/go.mod h1:Pb1v0c7/g8aGQJwx9Us09W85yGoyvSwuhEGMH7zjDKQ= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -903,8 +923,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1083,7 +1103,6 @@ github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblf github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.7.3/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= @@ -1112,15 +1131,17 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5 h1:yrv1uUvgXH/tEat+wdvJMRJ4g51GlIydtDpU9pFjaaI= github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.2.5 h1:DrW6hGnjIhtvhOIiAKT6Psh/Kd/ldepEa81DKeiRJ5I= +github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= +github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -1150,8 +1171,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -1179,6 +1201,7 @@ github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod h1:qOQCunE github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -1203,8 +1226,9 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8/go.mod h1:KyKXa9ciM8+lgMXwOVsXi7UxGrsf9mM61Mzs+xKUrKE= github.com/google/go-containerregistry v0.1.2/go.mod h1:GPivBPgdAyd2SU+vf6EpsgOtWDuPqjW0hJZt4rNdTZ4= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= @@ -1231,8 +1255,9 @@ github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:x github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -1242,7 +1267,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -1250,6 +1274,8 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod h1:RaTPr0KUf2K7fnZYLNDrr8rxAamWs3iNywJLtQ2AzBg= +github.com/google/s2a-go v0.1.5 h1:8IYp3w9nysqv3JH+NJgXJzGbDHzLOTj43BmSkp+O7qg= +github.com/google/s2a-go v0.1.5/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= @@ -1257,14 +1283,16 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s= github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= -github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= +github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw= +github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -1276,15 +1304,14 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= github.com/gookit/color v1.3.1 h1:PPD/C7sf8u2L8XQPdPgsWRoAiLQGZEZOzU3cf5IYYUk= github.com/gookit/color v1.3.1/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= @@ -1297,14 +1324,15 @@ github.com/goreleaser/nfpm v1.3.0/go.mod h1:w0p7Kc9TAUgWMyrub63ex3M2Mgw88M4GZXoT github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= -github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= -github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= +github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= +github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -1332,8 +1360,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 h1:ESEyqQqXXFIcImj/BE8oKEX37Zsuceb2cZI+EL/zNCY= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0/go.mod h1:XnLCLFp3tjoZJszVKjfpyAK6J8sYIcQXWQxmqLWF21I= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1 h1:RoziI+96HlQWrbaVhgOOdFYUHtX81pwA6tCgDS9FNRo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1/go.mod h1:Rj8lEaVgLiPn1jTMVXEhATiZhuyXJq167bMYPbJM1CY= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= @@ -1492,8 +1520,9 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= @@ -1501,8 +1530,9 @@ github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/improbable-eng/grpc-web v0.13.0 h1:7XqtaBWaOCH0cVGKHyvhtcuo6fgW32Y10yRKrDHFHOc= github.com/improbable-eng/grpc-web v0.13.0/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= @@ -1589,8 +1619,9 @@ github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kevinburke/go-bindata v3.23.0+incompatible h1:rqNOXZlqrYhMVVAsQx8wuc+LaA73YcfbQ407wAykyS8= github.com/kevinburke/go-bindata v3.23.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM= -github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -1603,12 +1634,15 @@ github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= +github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1619,8 +1653,9 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -1628,8 +1663,9 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lab47/vterm v0.0.0-20201001232628-a9dd795f94c2 h1:kKK3E7yYM7ZZVlc6M2Rtu3LmQoDLpXCiEu+iGT4O7Rw= github.com/lab47/vterm v0.0.0-20201001232628-a9dd795f94c2/go.mod h1:IODMeTGM8OBitkNwP3bvFuccNVzo1gIevvC3dM6MujU= github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA= @@ -1729,8 +1765,6 @@ github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb44 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= @@ -1808,11 +1842,13 @@ github.com/moby/sys/mountinfo v0.1.0/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+S github.com/moby/sys/mountinfo v0.1.3/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= +github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/sys/symlink v0.2.0 h1:tk1rOM+Ljp0nFmfOIBtlV3rTDlWOwFRhjEeAhZB0nZc= github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= +github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo= +github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= @@ -1891,7 +1927,9 @@ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1902,7 +1940,8 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1915,8 +1954,8 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM github.com/opencontainers/image-spec v1.0.2-0.20210730191737-8e42a01fb1b7/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= -github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= +github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc10/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -1925,8 +1964,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc92/go.mod h1:X1zlU4p7wOlX4+WRCz+hvlRv8phdL7UqbYD+vQwNMmE= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runc v1.3.6 h1:SLGIymCtsk80iNPWgbc8dtjI30r+5mTVV+4dN8/17Sk= +github.com/opencontainers/runc v1.3.6/go.mod h1:o1wyv76EDlTkcf0KTFgN8bMWLPvgF/HfX709lDv+rr4= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= @@ -1938,9 +1977,8 @@ github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mo github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opencontainers/selinux v1.10.1 h1:09LIPVRP3uuZGQvgR+SgMSNBd1Eb3vlRbGqQpoHsF8w= -github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE= +github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= @@ -1975,6 +2013,7 @@ github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+v github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= +github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU= @@ -1984,6 +2023,8 @@ github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUM github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v3 v3.3.2 h1:QTUOCbMNDbK4PYtkuHyOBd28C0UhPBw3T4OH4WpFDik= github.com/pierrec/lz4/v3 v3.3.2/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= +github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU= +github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1993,10 +2034,10 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.3.0/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= @@ -2013,15 +2054,17 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= +github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= +github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= @@ -2032,8 +2075,9 @@ github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4= +github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -2047,8 +2091,9 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc= +github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= @@ -2071,8 +2116,10 @@ github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -2084,8 +2131,9 @@ github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Q github.com/rubenv/sql-migrate v1.1.1 h1:haR5Hn8hbW9/SpAICrXoZqXnywS7Q5WijwkQENPeNWY= github.com/rubenv/sql-migrate v1.1.1/go.mod h1:/7TZymwxN8VWumcIxw1jjHEcR1djpdkMHQPT4FWdnbQ= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= +github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0fVb9d5fSEaLhoE= @@ -2110,13 +2158,13 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/sebdah/goldie/v2 v2.5.3 h1:9ES/mNN+HNUbNWpVAlrzuZ7jE+Nrczbj8uFRjM7624Y= github.com/sebdah/goldie/v2 v2.5.3/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989/go.mod h1:i9l/TNj+yDFh9SZXUTvspXTjbFXgZGP/UvhU1S65A4A= github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc= github.com/sethvargo/go-envconfig v0.2.0/go.mod h1:XZ2JRR7vhlBEO5zMmOpLgUhgYltqYqq4d4tKagtPUv0= github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= @@ -2135,8 +2183,11 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= +github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g= +github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= +github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= @@ -2157,8 +2208,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -2171,8 +2222,9 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= +github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -2181,8 +2233,10 @@ github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bd github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= @@ -2200,8 +2254,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -2213,8 +2268,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= @@ -2302,8 +2358,8 @@ github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVT github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= github.com/xanzy/go-gitlab v0.32.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= -github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= -github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= @@ -2416,11 +2472,12 @@ go.starlark.net v0.0.0-20200707032745-474f21a9602d/go.mod h1:f0znQkUKRrkk36XxWbG go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y= @@ -2428,6 +2485,9 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= gocloud.dev v0.19.0/go.mod h1:SmKwiR8YwIMMJvQBKLsC3fHNyMwXLw3PMDO+VVteJMI= golang.org/x/build v0.0.0-20190314133821-5284462c4bec/go.mod h1:atTaCNAy0f16Ah5aV1gMSwgiKVHwu/JncqDpuRr7lS4= @@ -2470,15 +2530,15 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= +golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2492,6 +2552,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200213203834-85f925bdd4d0/go.mod h1:IX6Eufr4L0ErOUlzqX/aFlHqsiKZRbV42Kb69e9VsTE= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM= +golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -2507,7 +2569,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -2523,8 +2584,9 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2615,8 +2677,9 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2649,8 +2712,9 @@ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7Lm golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= -golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= +golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= +golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2667,8 +2731,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= +golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2774,7 +2838,6 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2784,7 +2847,6 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2798,14 +2860,12 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2822,19 +2882,20 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= +golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc= +golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2846,9 +2907,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus= +golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2857,8 +2919,9 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= +golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2954,7 +3017,6 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -2964,8 +3026,9 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3042,8 +3105,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.103.0 h1:9yuVqlu2JCvcLg9p8S3fcFLZij8EPSyvODIY1rkMizQ= -google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= +google.golang.org/api v0.134.0 h1:ktL4Goua+UBgoP1eL1/60LwZJqa1sIzkLmvoR3hR6Gw= +google.golang.org/api v0.134.0/go.mod h1:sjRL3UnjTx5UqNQS9EWr9N8p7xbHpy1k0XGRLCf3Spk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -3109,9 +3172,7 @@ google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -3183,8 +3244,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c h1:S34D59DS2GWOEwWNt4fYmTcFrtlOgukG2k9WsomZ7tg= -google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= +google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 h1:RmoJA1ujG+/lRGNfUnOMfhCy5EipVMyvUE+KNbPbTlw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -3232,8 +3297,9 @@ google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0 h1:TLkBREm4nIsEcexnCjgQd5GQWaHcqMzwQV0TX9pq8S0= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0/go.mod h1:DNq5QpG7LJqD2AamLZ7zvKE0DEpVl2BSEVjFycAAjRY= @@ -3251,8 +3317,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= +google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/DataDog/dd-trace-go.v1 v1.22.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= gopkg.in/DataDog/dd-trace-go.v1 v1.27.0 h1:WGVt9dwn9vNeWZVdDYzjGQbEW8CghAkJlrC8w80jFVY= gopkg.in/DataDog/dd-trace-go.v1 v1.27.0/go.mod h1:Sp1lku8WJMvNV0kjDI4Ni/T7J/U3BO5ct5kEaoVU8+I= diff --git a/internal/cli/docs.go b/internal/cli/docs.go index 273151c6c..3f466d22c 100644 --- a/internal/cli/docs.go +++ b/internal/cli/docs.go @@ -121,7 +121,7 @@ description: "%s" matches := reUsage.FindStringSubmatch(usage) if len(matches) > 0 { - fmt.Fprintf(w, fmt.Sprintf("## Usage\n\nUsage: `derrick %s`\n", matches[1])) + fmt.Fprintf(w, "## Usage\n\nUsage: `derrick %s`\n", matches[1]) hasAlias := false if optionalAlias != "" { @@ -129,7 +129,7 @@ description: "%s" if len(matchAlias) > 0 { hasAlias = true aliasMatch := reUsage.FindStringSubmatch(optionalAlias) - fmt.Fprintf(w, fmt.Sprintf("\nAlias: `derrick %s`\n", aliasMatch[1])) + fmt.Fprintf(w, "\nAlias: `derrick %s`\n", aliasMatch[1]) } } diff --git a/internal/cli/hclgen/hclgen.go b/internal/cli/hclgen/hclgen.go index 323755340..59c8ee9ec 100644 --- a/internal/cli/hclgen/hclgen.go +++ b/internal/cli/hclgen/hclgen.go @@ -104,10 +104,10 @@ func HclGen(ui terminal.UI) bool { exitSafe(hclFile, brackets, ui, hclFileByte) return false } - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"build {\n"))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%sbuild {\n", genIndent(brackets)))...) brackets++ if plug.Name != "" { - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"use \"%s\" {\n", plug.Name))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%suse \"%s\" {\n", genIndent(brackets), plug.Name))...) brackets++ fieldMap, close, err := populatePlugins(plug, ui) if err != nil { @@ -144,9 +144,9 @@ func HclGen(ui terminal.UI) bool { } // A registry stanza will only appear in the file if one is chosen if plug.Name != "" { - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"registry {\n"))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%sregistry {\n", genIndent(brackets)))...) brackets++ - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"use \"%s\" {\n", plug.Name))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%suse \"%s\" {\n", genIndent(brackets), plug.Name))...) brackets++ fieldMap, close, err := populatePlugins(plug, ui) if err != nil { @@ -184,9 +184,9 @@ func HclGen(ui terminal.UI) bool { // A deployer stanza will only appear in the file if one is chosen if plug.Name != "" { - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"deploy {\n"))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%sdeploy {\n", genIndent(brackets)))...) brackets++ - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"use \"%s\" {\n", plug.Name))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%suse \"%s\" {\n", genIndent(brackets), plug.Name))...) brackets++ fieldMap, close, err := populatePlugins(plug, ui) if err != nil { @@ -222,9 +222,9 @@ func HclGen(ui terminal.UI) bool { // A releaser stanza will only appear in the file if one is chosen if plug.Name != "" { - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"release {\n"))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%srelease {\n", genIndent(brackets)))...) brackets++ - hclFileByte = append(hclFileByte, []byte(fmt.Sprintf(genIndent(brackets)+"use \"%s\" {\n", plug.Name))...) + hclFileByte = append(hclFileByte, []byte(fmt.Sprintf("%suse \"%s\" {\n", genIndent(brackets), plug.Name))...) brackets++ fieldMap, close, err := populatePlugins(plug, ui) if err != nil { @@ -267,21 +267,21 @@ func HclGen(ui terminal.UI) bool { func writeFields(byteS []byte, fieldMap map[string]fieldInfo, brackets int, ui terminal.UI) ([]byte, error) { for key, elem := range fieldMap { if elem.isParent { - byteS = append(byteS, []byte(fmt.Sprintf(genIndent(brackets)+"%s {\n", key))...) + byteS = append(byteS, []byte(fmt.Sprintf("%s%s {\n", genIndent(brackets), key))...) brackets++ for name, cont := range elem.children { if cont == "" { - byteS = append(byteS, []byte(fmt.Sprintf(genIndent(brackets)+"//The following field was skipped during file generation\n"))...) + byteS = append(byteS, []byte(fmt.Sprintf("%s//The following field was skipped during file generation\n", genIndent(brackets)))...) } - byteS = append(byteS, []byte(fmt.Sprintf(genIndent(brackets)+"%s = \"%s\"\n", name, cont))...) + byteS = append(byteS, []byte(fmt.Sprintf("%s%s = \"%s\"\n", genIndent(brackets), name, cont))...) } byteS = closeBrackets(byteS, 1, brackets) brackets-- } else { if elem.contents == "" { - byteS = append(byteS, []byte(fmt.Sprintf(genIndent(brackets)+"//The following field was skipped during file generation\n"))...) + byteS = append(byteS, []byte(fmt.Sprintf("%s//The following field was skipped during file generation\n", genIndent(brackets)))...) } - byteS = append(byteS, []byte(fmt.Sprintf(genIndent(brackets)+"%s = \"%s\"\n", key, elem.contents))...) + byteS = append(byteS, []byte(fmt.Sprintf("%s%s = \"%s\"\n", genIndent(brackets), key, elem.contents))...) } } return byteS, nil @@ -303,7 +303,7 @@ func closeBrackets(byteS []byte, toClose int, outstanding int) []byte { toPrint = toPrint + " " } toPrint = toPrint + "}\n" - byteS = append(byteS, []byte(fmt.Sprintf(toPrint))...) + byteS = append(byteS, []byte(toPrint)...) toPrint = "" } return byteS diff --git a/internal/cli/token.go b/internal/cli/token.go index d22284734..5a503a334 100644 --- a/internal/cli/token.go +++ b/internal/cli/token.go @@ -41,7 +41,7 @@ func (c *GetInviteCommand) Run(args []string) int { } // Warn of deprecation - fmt.Fprintf(os.Stderr, strings.TrimSpace(warnTokenDeprecated)+"\n\n") + fmt.Fprintf(os.Stderr, "%s\n\n", strings.TrimSpace(warnTokenDeprecated)) // We use fmt here and not the UI helpers because UI helpers will // trim tokens horizontally on terminals that are narrow. @@ -117,7 +117,7 @@ func (c *ExchangeInviteCommand) Run(args []string) int { } // Warn of deprecation - fmt.Fprintf(os.Stderr, strings.TrimSpace(warnTokenDeprecated)+"\n\n") + fmt.Fprintf(os.Stderr, "%s\n\n", strings.TrimSpace(warnTokenDeprecated)) // We use fmt here and not the UI helpers because UI helpers will // trim tokens horizontally on terminals that are narrow. @@ -180,7 +180,7 @@ func (c *GetTokenCommand) Run(args []string) int { } // Warn of deprecation - fmt.Fprintf(os.Stderr, strings.TrimSpace(warnTokenDeprecated)+"\n\n") + fmt.Fprintf(os.Stderr, "%s\n\n", strings.TrimSpace(warnTokenDeprecated)) // We use fmt here and not the UI helpers because UI helpers will // trim tokens horizontally on terminals that are narrow. diff --git a/internal/installutil/odr.go b/internal/installutil/odr.go index 7d12af39e..6377b3a60 100644 --- a/internal/installutil/odr.go +++ b/internal/installutil/odr.go @@ -3,7 +3,7 @@ package installutil import ( "fmt" - "github.com/distribution/distribution/v3/reference" + "github.com/distribution/reference" pb "github.com/nomatronio/derrick/pkg/server/gen" ) diff --git a/internal/runner/accept.go b/internal/runner/accept.go index 2b2ea37d1..2ff41f798 100644 --- a/internal/runner/accept.go +++ b/internal/runner/accept.go @@ -523,7 +523,11 @@ RESTART_JOB_STREAM: }, }); err != nil { log.Error("error sending job complete message", "error", err) - return err + if err != io.EOF && + status.Code(err) != codes.Unavailable && + status.Code(err) != codes.NotFound { + return err + } } } diff --git a/internal/runner/accept_test.go b/internal/runner/accept_test.go index 62279a405..e5c53cd0d 100644 --- a/internal/runner/accept_test.go +++ b/internal/runner/accept_test.go @@ -363,6 +363,12 @@ func TestRunnerAccept_serverDownJobExec(t *testing.T) { // Restart restartCh <- struct{}{} + // Wait for the runner to reconnect before completing the job. + require.Eventually(func() bool { + _, err := client.GetRunner(ctx, &pb.GetRunnerRequest{RunnerId: runner.Id()}) + return err == nil + }, 5*time.Second, 10*time.Millisecond) + // Let job complete close(noopCh) diff --git a/internal/server/boltdbstate/instance.go b/internal/server/boltdbstate/instance.go index 46137e713..25eed92a0 100644 --- a/internal/server/boltdbstate/instance.go +++ b/internal/server/boltdbstate/instance.go @@ -99,12 +99,12 @@ func (s *State) InstanceCreate(ctx context.Context, rec *serverstate.Instance) e // Create our instance if err := txn.Insert(instanceTableName, rec); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } // Delete all the instance exec sessions. This should be empty anyways. if _, err := txn.DeleteAll(instanceExecTableName, instanceExecInstanceIdIndexName, rec.Id); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -116,7 +116,7 @@ func (s *State) InstanceDelete(ctx context.Context, id string) error { txn := s.inmem.Txn(true) defer txn.Abort() if _, err := txn.DeleteAll(instanceTableName, instanceIdIndexName, id); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() diff --git a/internal/server/boltdbstate/instance_exec.go b/internal/server/boltdbstate/instance_exec.go index 00157a340..f1f17202a 100644 --- a/internal/server/boltdbstate/instance_exec.go +++ b/internal/server/boltdbstate/instance_exec.go @@ -83,7 +83,7 @@ func (s *State) InstanceExecCreateByTargetedInstance(ctx context.Context, id str // Insert if err := txn.Insert(instanceExecTableName, exec); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -116,7 +116,7 @@ func (s *State) InstanceExecCreateForVirtualInstance(ctx context.Context, id str // Insert if err := txn.Insert(instanceExecTableName, exec); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -130,7 +130,7 @@ func (s *State) InstanceExecCreateByDeployment(ctx context.Context, did string, // Find all the instances by deployment iter, err := txn.Get(instanceTableName, instanceDeploymentIdIndexName, did) if err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } // Go through each to try to find the least loaded. Most likely there @@ -181,13 +181,13 @@ func (s *State) InstanceExecCreateByDeployment(ctx context.Context, did string, if min == nil { // If we have no running instances then show a special error. if empty { - return status.Errorf(codes.ResourceExhausted, strings.TrimSpace(errNoRunningInstances)) + return status.Errorf(codes.ResourceExhausted, "%s", strings.TrimSpace(errNoRunningInstances)) } // If we have at least one disabled, that means all have to be disabled // to get to this error. if disabled { - return status.Errorf(codes.ResourceExhausted, strings.TrimSpace(errExecAllDisabled)) + return status.Errorf(codes.ResourceExhausted, "%s", strings.TrimSpace(errExecAllDisabled)) } // This SHOULD be impossible since right now we'll always assign @@ -205,7 +205,7 @@ func (s *State) InstanceExecCreateByDeployment(ctx context.Context, did string, // Insert if err := txn.Insert(instanceExecTableName, exec); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -217,7 +217,7 @@ func (s *State) InstanceExecDelete(ctx context.Context, id int64) error { defer txn.Abort() if _, err := txn.DeleteAll(instanceExecTableName, instanceExecIdIndexName, id); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -258,7 +258,7 @@ func (s *State) instanceExecListByInstanceId( // Find all the exec sessions iter, err := txn.Get(instanceExecTableName, instanceExecInstanceIdIndexName, id) if err != nil { - return nil, status.Errorf(codes.Aborted, err.Error()) + return nil, status.Errorf(codes.Aborted, "%s", err.Error()) } var result []*serverstate.InstanceExec diff --git a/internal/server/boltdbstate/instance_logs.go b/internal/server/boltdbstate/instance_logs.go index d18dc5e2d..59dab7d76 100644 --- a/internal/server/boltdbstate/instance_logs.go +++ b/internal/server/boltdbstate/instance_logs.go @@ -69,7 +69,7 @@ func (s *State) InstanceLogsCreate(ctx context.Context, id string, logs *Instanc // Insert if err := txn.Insert(instanceLogsTableName, logs); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -80,7 +80,7 @@ func (s *State) InstanceLogsDelete(ctx context.Context, id int64) error { txn := s.inmem.Txn(true) defer txn.Abort() if _, err := txn.DeleteAll(instanceLogsTableName, instanceLogsIdIndexName, id); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } txn.Commit() @@ -127,7 +127,7 @@ func (s *State) instanceLogsListByInstanceId( // Find all the exec sessions iter, err := txn.Get(instanceLogsTableName, instanceLogsInstanceIdIndexName, id) if err != nil { - return nil, status.Errorf(codes.Aborted, err.Error()) + return nil, status.Errorf(codes.Aborted, "%s", err.Error()) } var result []*InstanceLogs diff --git a/internal/server/boltdbstate/instance_test.go b/internal/server/boltdbstate/instance_test.go index ef5d4e3a8..9c73e1a38 100644 --- a/internal/server/boltdbstate/instance_test.go +++ b/internal/server/boltdbstate/instance_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" pb "github.com/nomatronio/derrick/pkg/server/gen" "github.com/nomatronio/derrick/pkg/serverstate" @@ -89,10 +90,9 @@ func TestInstancesByApp(t *testing.T) { require.Len(list, 1) // Should not for other app - //nolint:govet,copylocks - ref2 := *ref + ref2 := proto.Clone(ref).(*pb.Ref_Application) ref2.Application = "NO" - list, err = s.InstancesByApp(ctx, &ref2, nil, nil) + list, err = s.InstancesByApp(ctx, ref2, nil, nil) require.NoError(err) require.Empty(list) } @@ -137,10 +137,9 @@ func TestInstancesByAppWorkspace(t *testing.T) { require.Len(list, 1) // Should not for other app - //nolint:govet,copylocks - ref2 := *refWs + ref2 := proto.Clone(refWs).(*pb.Ref_Workspace) ref2.Workspace = "NO" - list, err = s.InstancesByApp(ctx, ref, &ref2, nil) + list, err = s.InstancesByApp(ctx, ref, ref2, nil) require.NoError(err) require.Empty(list) } diff --git a/internal/server/boltdbstate/pipeline.go b/internal/server/boltdbstate/pipeline.go index 919a9e69e..fda85f601 100644 --- a/internal/server/boltdbstate/pipeline.go +++ b/internal/server/boltdbstate/pipeline.go @@ -78,7 +78,7 @@ func (s *State) pipelinePut( // The data should be validated before this, but it is a critical // issue if there are validation errors so we test again. if err := ptypes.ValidatePipeline(value); err != nil { - return status.Errorf(codes.FailedPrecondition, err.Error()) + return status.Errorf(codes.FailedPrecondition, "%s", err.Error()) } // Get the global bucket and write the value to it. @@ -192,7 +192,7 @@ func (s *State) pipelineDelete( // Delete from memdb if _, err := memTxn.DeleteAll(pipelineIndexTableName, pipelineIndexId, string(id)); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } return nil diff --git a/internal/server/boltdbstate/pipeline_run.go b/internal/server/boltdbstate/pipeline_run.go index 9599eaec9..f7adbfcfc 100644 --- a/internal/server/boltdbstate/pipeline_run.go +++ b/internal/server/boltdbstate/pipeline_run.go @@ -82,7 +82,7 @@ func (s *State) pipelineRunPut( // issue if there are validation errors, we test again. if err := ptypes.ValidatePipelineRun(value); err != nil { - return status.Errorf(codes.FailedPrecondition, err.Error()) + return status.Errorf(codes.FailedPrecondition, "%s", err.Error()) } // Get the global bucket and write the value to it. diff --git a/internal/server/boltdbstate/workspace.go b/internal/server/boltdbstate/workspace.go index a77ed33f0..9d5f7afb6 100644 --- a/internal/server/boltdbstate/workspace.go +++ b/internal/server/boltdbstate/workspace.go @@ -228,7 +228,7 @@ func (s *State) workspaceDelete( // Delete from memdb if _, err := memTxn.DeleteAll(workspaceTableName, workspaceIdIndexName, string(id)); err != nil { - return status.Errorf(codes.Aborted, err.Error()) + return status.Errorf(codes.Aborted, "%s", err.Error()) } return nil diff --git a/internal/serverinstall/nomad.go b/internal/serverinstall/nomad.go index 20f060f4a..98b5e80ee 100644 --- a/internal/serverinstall/nomad.go +++ b/internal/serverinstall/nomad.go @@ -1092,7 +1092,7 @@ func getHTTPFromAllocID(allocID string, client *api.Client) (string, error) { for _, port := range alloc.AllocatedResources.Shared.Ports { if port.Label == "ui" { - return fmt.Sprintf(port.HostIP + ":9702"), nil + return port.HostIP + ":9702", nil } } diff --git a/pkg/server/singleprocess/auth.go b/pkg/server/singleprocess/auth.go index a349a78a1..5974ccb74 100644 --- a/pkg/server/singleprocess/auth.go +++ b/pkg/server/singleprocess/auth.go @@ -284,7 +284,7 @@ func (s *Service) authLogin( if err != nil { msg := "failed to decode id when authenticating login token" log.Error(msg, "id", login.Login.UserId, "err", err) - return nil, status.Errorf(codes.Internal, msg) + return nil, status.Errorf(codes.Internal, "%s", msg) } // Look up the user that this token is for. @@ -355,7 +355,7 @@ func (s *Service) decodeToken(ctx context.Context, token string) (*pb.TokenTrans isValid, err := s.state(ctx).TokenSignatureVerify(ctx, tt.Body, tt.Signature, tt.KeyId) if err != nil { - return nil, nil, errors.Wrapf(ErrInvalidToken, err.Error()) + return nil, nil, errors.Wrapf(ErrInvalidToken, "%s", err.Error()) } if !isValid { return nil, nil, errors.Wrapf(ErrInvalidToken, "bad token signature") @@ -540,7 +540,7 @@ func (s *Service) GenerateRunnerToken( if k.Runner.Id != req.Id { msg := "cannot generate a token for runner " + req.Id + " using a runner token for runner " + k.Runner.Id log.Error(msg) - return nil, status.Errorf(codes.InvalidArgument, msg) + return nil, status.Errorf(codes.InvalidArgument, "%s", msg) } } default: diff --git a/pkg/server/singleprocess/auth_test.go b/pkg/server/singleprocess/auth_test.go index 50c38c44e..2bb6e4e76 100644 --- a/pkg/server/singleprocess/auth_test.go +++ b/pkg/server/singleprocess/auth_test.go @@ -20,8 +20,7 @@ import ( func TestServiceAuth(t *testing.T) { // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(t, err) + impl := mustNew(t) s := impl.(*Service) ctx := context.Background() @@ -386,7 +385,6 @@ func TestServiceAuth(t *testing.T) { t.Run("validate that a runner token can't be created for a different runner", func(t *testing.T) { require := require.New(t) - require.NoError(err) require.NoError(s.state(ctx).RunnerCreate(ctx, &pb.Runner{ Id: "A", @@ -418,8 +416,7 @@ func TestServiceAuth(t *testing.T) { func TestServiceAuth_TriggerToken(t *testing.T) { // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(t, err) + impl := mustNew(t) s := impl.(*Service) ctx := context.Background() @@ -460,8 +457,7 @@ func TestServiceBootstrapToken(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) { // Initial bootstrap should return a token @@ -484,8 +480,7 @@ func TestServiceDecodeToken(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Grab our bootstrap token, that'll work resp, err := impl.BootstrapToken(ctx, &empty.Empty{}) @@ -501,8 +496,7 @@ func TestServiceDecodeToken(t *testing.T) { func TestServiceAuth_userSuperuserForced(t *testing.T) { // Create our server - impl, err := New(WithDB(testDB(t)), WithSuperuser()) - require.NoError(t, err) + impl := mustNew(t, WithSuperuser()) s := impl.(*Service) ctx := context.Background() diff --git a/pkg/server/singleprocess/poll_test.go b/pkg/server/singleprocess/poll_test.go index 6a3ea8fdf..b4309ae0c 100644 --- a/pkg/server/singleprocess/poll_test.go +++ b/pkg/server/singleprocess/poll_test.go @@ -30,8 +30,7 @@ func TestPollQueuer_peek(t *testing.T) { defer cancel() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Create our mock handler mockH := &mocks.PollHandler{} @@ -70,16 +69,13 @@ func TestPollQueuer_peek(t *testing.T) { // Test that if the watchset triggers while we're waiting, we re-peek t.Run("watchset trigger", func(t *testing.T) { - require := require.New(t) - var wg sync.WaitGroup ctx, cancel := context.WithCancel(context.Background()) defer wg.Wait() defer cancel() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Create our mock handler mockH := &mocks.PollHandler{} @@ -129,16 +125,13 @@ func TestPollQueuer_peek(t *testing.T) { // Test that watchset takes priority over a pending poll timer. t.Run("long poll with watchset trigger", func(t *testing.T) { - require := require.New(t) - var wg sync.WaitGroup ctx, cancel := context.WithCancel(context.Background()) defer wg.Wait() defer cancel() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Create our mock handler mockH := &mocks.PollHandler{} @@ -198,8 +191,7 @@ func TestPollQueuer_queue(t *testing.T) { defer cancel() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Create our mock handler mockH := &mocks.PollHandler{} @@ -233,8 +225,7 @@ func TestPollQueuer_queue(t *testing.T) { defer cancel() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Create our mock handler mockH := &mocks.PollHandler{} @@ -277,8 +268,7 @@ func TestPollQueuer_queue(t *testing.T) { defer cancel() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Create our mock handler mockH := &mocks.PollHandler{} @@ -321,12 +311,11 @@ func TestServicePollQueue(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t, WithPollingDisabled(false)) client := server.TestServer(t, impl) // Create a project - _, err = client.UpsertProject(ctx, &pb.UpsertProjectRequest{ + _, err := client.UpsertProject(ctx, &pb.UpsertProjectRequest{ Project: serverptypes.TestProject(t, &pb.Project{ Name: "A", DataSource: &pb.Job_DataSource{ @@ -385,12 +374,11 @@ func TestProjectPollHandler(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t, WithPollingDisabled(false)) client := server.TestServer(t, impl) // Create a project - _, err = client.UpsertProject(ctx, &pb.UpsertProjectRequest{ + _, err := client.UpsertProject(ctx, &pb.UpsertProjectRequest{ Project: serverptypes.TestProject(t, &pb.Project{ Name: "Example", DataSource: &pb.Job_DataSource{ @@ -464,8 +452,7 @@ func TestApplicationPollHandler(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t, WithPollingDisabled(false)) client := server.TestServer(t, impl) appName := "apple-app" @@ -580,8 +567,7 @@ func TestApplicationPollHandler_fullLifecycle(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t, WithPollingDisabled(false)) client := server.TestServer(t, impl) appName := "apple-app" diff --git a/pkg/server/singleprocess/service_deploy_test.go b/pkg/server/singleprocess/service_deploy_test.go index c85f5b41f..a38e355b6 100644 --- a/pkg/server/singleprocess/service_deploy_test.go +++ b/pkg/server/singleprocess/service_deploy_test.go @@ -15,8 +15,7 @@ func TestServiceDeployment_URLService(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t)), TestWithURLService(t, nil)) - require.NoError(t, err) + impl := mustNew(t, TestWithURLService(t, nil)) client := server.TestServer(t, impl) // Simplify writing tests diff --git a/pkg/server/singleprocess/service_entrypoint_test.go b/pkg/server/singleprocess/service_entrypoint_test.go index f8c82c5a8..18fdf22f6 100644 --- a/pkg/server/singleprocess/service_entrypoint_test.go +++ b/pkg/server/singleprocess/service_entrypoint_test.go @@ -24,8 +24,7 @@ func TestServiceEntrypointConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create a deployment @@ -61,8 +60,7 @@ func TestServiceEntrypointConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create a deployment @@ -97,8 +95,7 @@ func TestServiceEntrypointConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t)), TestWithURLService(t, nil)) - require.NoError(err) + impl := mustNew(t, TestWithURLService(t, nil)) client := server.TestServer(t, impl) // Create a deployment @@ -139,12 +136,10 @@ func TestServiceEntrypointConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New( - WithDB(testDB(t)), + impl := mustNew(t, TestWithURLService(t, nil), TestWithURLServiceGuestAccount(t), ) - require.NoError(err) client := server.TestServer(t, impl) // Create a deployment @@ -185,8 +180,7 @@ func TestServiceEntrypointConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create a deployment @@ -295,8 +289,7 @@ func TestServiceEntrypointExecStream_badOpen(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Start exec with a bad starting message @@ -320,8 +313,7 @@ func TestServiceEntrypointExecStream_invalidInstanceId(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Start exec with a bad starting message @@ -348,8 +340,7 @@ func TestServiceEntrypointExecStream_invalidSessionId(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) exec, closer := testRegisterExec(ctx, t, client, impl) @@ -379,8 +370,7 @@ func TestServiceEntrypointExecStream_closeSend(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) exec, closer := testRegisterExec(ctx, t, client, impl) @@ -416,8 +406,7 @@ func TestServiceEntrypointExecStream_doubleStart(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) exec, closer := testRegisterExec(ctx, t, client, impl) diff --git a/pkg/server/singleprocess/service_exec_test.go b/pkg/server/singleprocess/service_exec_test.go index 50b61d829..236d91c8f 100644 --- a/pkg/server/singleprocess/service_exec_test.go +++ b/pkg/server/singleprocess/service_exec_test.go @@ -23,8 +23,7 @@ func TestServiceStartExecStream_badOpen(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Start exec with a bad starting message @@ -48,8 +47,7 @@ func TestServiceStartExecStream_start(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance @@ -102,8 +100,7 @@ func TestServiceStartExecStream_eventExit(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance @@ -177,8 +174,7 @@ func TestServiceStartExecStream_eventError(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance @@ -253,8 +249,7 @@ func TestServiceStartExecStream_entrypointEventChClose(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance @@ -331,8 +326,7 @@ func TestServiceStartExecStream_targeted(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance @@ -385,8 +379,7 @@ func TestServiceStartExecStream_startPlugin(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance @@ -443,8 +436,7 @@ func TestService_waitOnJobStarted(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create an instance diff --git a/pkg/server/singleprocess/service_hostname_test.go b/pkg/server/singleprocess/service_hostname_test.go index ca51a8d23..f49778ba6 100644 --- a/pkg/server/singleprocess/service_hostname_test.go +++ b/pkg/server/singleprocess/service_hostname_test.go @@ -19,8 +19,7 @@ func TestServiceHostname(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create a hostname @@ -49,8 +48,7 @@ func TestServiceHostname(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t)), TestWithURLService(t, nil)) - require.NoError(err) + impl := mustNew(t, TestWithURLService(t, nil)) client := server.TestServer(t, impl) // Should have no hostnames diff --git a/pkg/server/singleprocess/service_job.go b/pkg/server/singleprocess/service_job.go index 9ff5c42a6..8b4c4e313 100644 --- a/pkg/server/singleprocess/service_job.go +++ b/pkg/server/singleprocess/service_job.go @@ -265,7 +265,7 @@ func (s *Service) QueueJob( return nil, status.Errorf(codes.Unimplemented, "operation is nil or unknown") } if err := serverptypes.ValidateJob(req.Job); err != nil { - return nil, status.Errorf(codes.FailedPrecondition, err.Error()) + return nil, status.Errorf(codes.FailedPrecondition, "%s", err.Error()) } jobs, jobId, err := s.queueJobReqToJob(ctx, req) diff --git a/pkg/server/singleprocess/service_pipeline_run_test.go b/pkg/server/singleprocess/service_pipeline_run_test.go index fb07ce8d5..050d99962 100644 --- a/pkg/server/singleprocess/service_pipeline_run_test.go +++ b/pkg/server/singleprocess/service_pipeline_run_test.go @@ -17,8 +17,7 @@ func TestServicePipelineRun(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -96,8 +95,7 @@ func TestServicePipelineRun(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app diff --git a/pkg/server/singleprocess/service_pipeline_test.go b/pkg/server/singleprocess/service_pipeline_test.go index 0648794ea..f5af6f600 100644 --- a/pkg/server/singleprocess/service_pipeline_test.go +++ b/pkg/server/singleprocess/service_pipeline_test.go @@ -17,8 +17,7 @@ func TestServicePipeline_Basic(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(t, err) + impl := mustNew(t) client := server.TestServer(t, impl) type Req = pb.UpsertPipelineRequest @@ -107,8 +106,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -226,8 +224,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -378,8 +375,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -490,8 +486,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create a job to use in TestJobNew that specifies the default @@ -651,8 +646,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -702,7 +696,7 @@ func TestServicePipeline_Run(t *testing.T) { } // Create, should get an ID back - _, err = client.UpsertPipeline(ctx, &pb.UpsertPipelineRequest{ + _, err := client.UpsertPipeline(ctx, &pb.UpsertPipelineRequest{ Pipeline: pipeline, }) require.NoError(err) @@ -782,8 +776,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -888,8 +881,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -952,7 +944,7 @@ func TestServicePipeline_Run(t *testing.T) { } // Create, should get an ID back - _, err = client.UpsertPipeline(ctx, &pb.UpsertPipelineRequest{ + _, err := client.UpsertPipeline(ctx, &pb.UpsertPipelineRequest{ Pipeline: pipeline, }) require.NoError(err) @@ -1082,8 +1074,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1207,8 +1198,7 @@ func TestServicePipeline_Run(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1408,8 +1398,7 @@ func TestServicePipeline_List(t *testing.T) { ctx := context.Background() // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app diff --git a/pkg/server/singleprocess/service_runner_test.go b/pkg/server/singleprocess/service_runner_test.go index 12927e983..329ca8f45 100644 --- a/pkg/server/singleprocess/service_runner_test.go +++ b/pkg/server/singleprocess/service_runner_test.go @@ -21,8 +21,7 @@ func TestServiceRunnerToken_happy(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get our cookied context @@ -136,8 +135,7 @@ func TestServiceRunnerToken_reject(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get our cookied context @@ -233,8 +231,7 @@ func TestServiceRunnerToken_invalidRunnerToken(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get our cookied context @@ -329,8 +326,7 @@ func TestServiceRunnerToken_zeroToLabels(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get our cookied context @@ -412,8 +408,7 @@ func TestServiceRunnerToken_changedLabels(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get our cookied context @@ -493,8 +488,7 @@ func TestServiceRunnerToken_validTokenWithLabels(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get our cookied context @@ -568,8 +562,7 @@ func TestServiceRunnerToken_noCookie(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Get the runner id id, err := server.Id() @@ -596,8 +589,7 @@ func TestServiceRunnerToken_noCookieValidToken(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) // Get the runner id id, err := server.Id() @@ -634,8 +626,7 @@ func TestServiceRunnerConfig_happy(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -686,8 +677,7 @@ func TestServiceRunnerConfig_preadopt(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -749,8 +739,7 @@ func TestServiceRunnerConfig_preadoptWrongId(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -796,8 +785,7 @@ func TestServiceRunnerConfig_preadoptAnyLabels(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -844,8 +832,7 @@ func TestServiceRunnerConfig_preadoptMismatchLabels(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -896,8 +883,7 @@ func TestServiceRunnerConfig_odrNoJob(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get the runner @@ -934,8 +920,7 @@ func TestServiceRunnerConfig_odrScopedConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Get the runner @@ -1081,8 +1066,7 @@ func TestServiceRunnerJobStream_complete(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Add a config source app variable for the job @@ -1195,8 +1179,7 @@ func TestServiceRunnerJobStream_badOpen(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Start exec with a bad starting message @@ -1220,8 +1203,7 @@ func TestServiceRunnerJobStream_errorBeforeAck(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1282,8 +1264,7 @@ func TestServiceRunnerJobStream_cancel(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1365,8 +1346,7 @@ func TestServiceRunnerJobStream_adoptCantImpersonate(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Create a job @@ -1403,8 +1383,7 @@ func TestServiceRunnerJobStream_reattachHappy(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1536,8 +1515,7 @@ func TestServiceRunnerJobStream_reattachInvalidJobId(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1613,8 +1591,7 @@ func TestServiceRunnerJobStream_reattachInvalidRunner(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Initialize our app @@ -1693,8 +1670,7 @@ func TestServiceRunnerGetDeploymentConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Request deployment config @@ -1707,12 +1683,11 @@ func TestServiceRunnerGetDeploymentConfig(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Set some config - _, err = client.SetServerConfig(ctx, &pb.SetServerConfigRequest{ + _, err := client.SetServerConfig(ctx, &pb.SetServerConfigRequest{ Config: serverptypes.TestServerConfig(t, nil), }) require.NoError(err) diff --git a/pkg/server/singleprocess/service_server.go b/pkg/server/singleprocess/service_server.go index 5ae8dcc24..e2e36299f 100644 --- a/pkg/server/singleprocess/service_server.go +++ b/pkg/server/singleprocess/service_server.go @@ -18,7 +18,7 @@ func (s *Service) SetServerConfig( req *pb.SetServerConfigRequest, ) (*empty.Empty, error) { if err := serverptypes.ValidateServerConfig(req.Config); err != nil { - return nil, status.Errorf(codes.FailedPrecondition, err.Error()) + return nil, status.Errorf(codes.FailedPrecondition, "%s", err.Error()) } if err := s.state(ctx).ServerConfigSet(ctx, req.Config); err != nil { diff --git a/pkg/server/singleprocess/service_server_test.go b/pkg/server/singleprocess/service_server_test.go index c6882fd95..3d0b91ab6 100644 --- a/pkg/server/singleprocess/service_server_test.go +++ b/pkg/server/singleprocess/service_server_test.go @@ -24,11 +24,7 @@ func TestServerConfigWithStartupConfig(t *testing.T) { db := testDB(t) // Create our server - impl, err := New( - WithDB(db), - WithConfig(cfg), - ) - require.NoError(t, err) + impl := mustNewDB(t, db, WithConfig(cfg)) _ = server.TestServer(t, impl) st, err := boltdbstate.New(hclog.L(), db) @@ -52,10 +48,7 @@ func TestServerConfigWithNoStartupConfig(t *testing.T) { ctx := context.Background() db := testDB(t) // Create our server - impl, err := New( - WithDB(db), - ) - require.NoError(t, err) + impl := mustNewDB(t, db) _ = server.TestServer(t, impl) st, err := boltdbstate.New(hclog.L(), db) diff --git a/pkg/server/singleprocess/service_snapshot_test.go b/pkg/server/singleprocess/service_snapshot_test.go index 56e0ed21d..8e80ba665 100644 --- a/pkg/server/singleprocess/service_snapshot_test.go +++ b/pkg/server/singleprocess/service_snapshot_test.go @@ -20,8 +20,7 @@ func TestServiceRestoreSnapshot_badOpen(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Start exec with a bad starting message @@ -45,8 +44,7 @@ func TestServiceRestoreSnapshot_full(t *testing.T) { require := require.New(t) // Create our server - impl, err := New(WithDB(testDB(t))) - require.NoError(err) + impl := mustNew(t) client := server.TestServer(t, impl) // Take a snapshot and write the contents to a buf diff --git a/pkg/server/singleprocess/service_task_test.go b/pkg/server/singleprocess/service_task_test.go index 6fb9622c9..d8b0cd834 100644 --- a/pkg/server/singleprocess/service_task_test.go +++ b/pkg/server/singleprocess/service_task_test.go @@ -18,8 +18,7 @@ func TestServiceTask_GetTask(t *testing.T) { // Create our server db := testDB(t) - impl, err := New(WithDB(db)) - require.NoError(t, err) + impl := mustNewDB(t, db) client := server.TestServer(t, impl) // Initialize our app @@ -154,8 +153,7 @@ func TestServiceTask_ListTaskSimple(t *testing.T) { // Create our server db := testDB(t) - impl, err := New(WithDB(db)) - require.NoError(t, err) + impl := mustNewDB(t, db) client := server.TestServer(t, impl) // Initialize our app @@ -249,8 +247,7 @@ func TestServiceTask_ListTaskFilters(t *testing.T) { // Create our server db := testDB(t) - impl, err := New(WithDB(db)) - require.NoError(t, err) + impl := mustNewDB(t, db) client := server.TestServer(t, impl) // Initialize our app @@ -347,8 +344,7 @@ func TestServiceTask_CancelTask(t *testing.T) { // Create our server db := testDB(t) - impl, err := New(WithDB(db)) - require.NoError(t, err) + impl := mustNewDB(t, db) client := server.TestServer(t, impl) // Initialize our app diff --git a/pkg/server/singleprocess/testing.go b/pkg/server/singleprocess/testing.go index 6fe60101a..a08e08350 100644 --- a/pkg/server/singleprocess/testing.go +++ b/pkg/server/singleprocess/testing.go @@ -3,8 +3,8 @@ package singleprocess import ( "context" "fmt" - "io" "io/ioutil" + "net" "os" "path/filepath" "time" @@ -39,14 +39,39 @@ func TestServer(t testing.T, opts ...Option) pb.DerrickClient { // TestImpl returns the waypoint server implementation. This can be used // with server.TestServer. It is easier to just use TestServer directly. func TestImpl(t testing.T, opts ...Option) pb.DerrickServer { - impl, err := New(append( - []Option{WithDB(testDB(t))}, - opts..., - )...) + return mustNew(t, opts...) +} + +// mustNew creates a test Service with background polling disabled and +// registers cleanup to stop background goroutines when the test ends. +func mustNew(t testing.T, opts ...Option) pb.DerrickServer { + t.Helper() + + opts = append([]Option{WithDB(testDB(t)), WithPollingDisabled(true)}, opts...) + impl, err := New(opts...) require.NoError(t, err) - if c, ok := impl.(io.Closer); ok { - t.Cleanup(func() { c.Close() }) - } + t.Cleanup(func() { + if s, ok := impl.(*Service); ok { + _ = s.Close() + } + }) + + return impl +} + +// mustNewDB is like mustNew but uses an existing bolt DB. +func mustNewDB(t testing.T, db *bolt.DB, opts ...Option) pb.DerrickServer { + t.Helper() + + opts = append([]Option{WithDB(db), WithPollingDisabled(true)}, opts...) + impl, err := New(opts...) + require.NoError(t, err) + t.Cleanup(func() { + if s, ok := impl.(*Service); ok { + _ = s.Close() + } + }) + return impl } @@ -56,6 +81,10 @@ func TestImpl(t testing.T, opts ...Option) pb.DerrickServer { // // If out is non-nil, it will be written to with the DevSetup info. func TestWithURLService(t testing.T, out *hzntest.DevSetup) Option { + if !horizonIntegrationEnabled() { + t.Skip("Horizon URL service requires localstack on localhost:4566") + } + // Create the test server. On test end we close the channel which quits // the Horizon test server. setupCh := make(chan *hzntest.DevSetup, 1) @@ -69,7 +98,13 @@ func TestWithURLService(t testing.T, out *hzntest.DevSetup) Option { setupCh <- setup <-closeCh }) - setup := <-setupCh + + var setup *hzntest.DevSetup + select { + case setup = <-setupCh: + case <-time.After(30 * time.Second): + t.Skip("Horizon URL service dev environment unavailable; skipping integration test") + } // Make our test registration API wphzndata := wphzn.TestServer(t, @@ -319,6 +354,15 @@ func testDB(t testing.T) *bolt.DB { return db } +func horizonIntegrationEnabled() bool { + conn, err := net.DialTimeout("tcp", "127.0.0.1:4566", 500*time.Millisecond) + if err != nil { + return false + } + _ = conn.Close() + return true +} + // WithDB return a server option with a boltdb state provider func WithDB(db *bolt.DB) Option { return func(s *Service, cfg *config) error { diff --git a/pkg/serverstate/statetest/test_instance.go b/pkg/serverstate/statetest/test_instance.go index 3baf97ed4..b311886a0 100644 --- a/pkg/serverstate/statetest/test_instance.go +++ b/pkg/serverstate/statetest/test_instance.go @@ -165,10 +165,11 @@ func TestInstance(t *testing.T, factory Factory, restartF RestartFactory) { require.Len(list, 1) // Should not for other app - //nolint:govet,copylocks - ref2 := *app - ref2.Application = "NO" - list, err = s.InstancesByApp(ctx, &ref2, nil, nil) + ref2 := &pb.Ref_Application{ + Project: app.Project, + Application: "NO", + } + list, err = s.InstancesByApp(ctx, ref2, nil, nil) require.NoError(err) require.Empty(list) }) @@ -228,10 +229,10 @@ func TestInstance(t *testing.T, factory Factory, restartF RestartFactory) { require.Len(list, 1) // Should not for other app - //nolint:govet,copylocks - ref2 := *wsRef - ref2.Workspace = "NO" - list, err = s.InstancesByApp(ctx, app, &ref2, nil) + ref2 := &pb.Ref_Workspace{ + Workspace: "NO", + } + list, err = s.InstancesByApp(ctx, app, ref2, nil) require.NoError(err) require.Empty(list) }) diff --git a/pkg/serverstate/statetest/test_runner_ondemand.go b/pkg/serverstate/statetest/test_runner_ondemand.go index 2ab424ed1..427fae5da 100644 --- a/pkg/serverstate/statetest/test_runner_ondemand.go +++ b/pkg/serverstate/statetest/test_runner_ondemand.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/proto" pb "github.com/nomatronio/derrick/pkg/server/gen" serverptypes "github.com/nomatronio/derrick/pkg/server/ptypes" @@ -115,7 +116,7 @@ func TestOnDemandRunnerConfig(t *testing.T, factory Factory, restartF RestartFac require.NoError(err) require.NotEmpty(putResp.Id) // must have chosen an id require.Equal(rec.Name, putResp.Name) - require.Equal(rec.TargetRunner.Target, putResp.TargetRunner.Target) + require.True(proto.Equal(rec.TargetRunner, putResp.TargetRunner)) require.Equal(rec.OciUrl, putResp.OciUrl) require.Equal(rec.EnvironmentVariables, putResp.EnvironmentVariables) require.Equal(rec.PluginConfig, putResp.PluginConfig) @@ -133,7 +134,7 @@ func TestOnDemandRunnerConfig(t *testing.T, factory Factory, restartF RestartFac // Ensure fields were saved correctly require.Equal(putResp.Id, resp.Id) require.Equal(rec.Name, resp.Name) - require.Equal(rec.TargetRunner.Target, resp.TargetRunner.Target) + require.True(proto.Equal(rec.TargetRunner, resp.TargetRunner)) require.Equal(rec.OciUrl, resp.OciUrl) require.Equal(rec.EnvironmentVariables, resp.EnvironmentVariables) require.Equal(rec.PluginConfig, resp.PluginConfig) @@ -199,7 +200,7 @@ func TestOnDemandRunnerConfig(t *testing.T, factory Factory, restartF RestartFac require.NoError(err) require.NotEmpty(putResp.Id) // must have chosen an id require.Equal(rec.Name, putResp.Name) - require.Equal(rec.TargetRunner.Target, putResp.TargetRunner.Target) + require.True(proto.Equal(rec.TargetRunner, putResp.TargetRunner)) require.Equal(rec.OciUrl, putResp.OciUrl) require.Equal(rec.EnvironmentVariables, putResp.EnvironmentVariables) require.Equal(rec.PluginConfig, putResp.PluginConfig) @@ -217,7 +218,7 @@ func TestOnDemandRunnerConfig(t *testing.T, factory Factory, restartF RestartFac // Ensure fields were saved correctly require.Equal(putResp.Id, resp.Id) require.Equal(rec.Name, resp.Name) - require.Equal(rec.TargetRunner.Target, resp.TargetRunner.Target) + require.True(proto.Equal(rec.TargetRunner, resp.TargetRunner)) require.Equal(rec.OciUrl, resp.OciUrl) require.Equal(rec.EnvironmentVariables, resp.EnvironmentVariables) require.Equal(rec.PluginConfig, resp.PluginConfig) diff --git a/pkg/serverstate/user.go b/pkg/serverstate/user.go index 155827100..191bd295a 100644 --- a/pkg/serverstate/user.go +++ b/pkg/serverstate/user.go @@ -2,6 +2,6 @@ package serverstate // See the docs in singleprocess. const ( - DefaultUser = "waypoint" + DefaultUser = "derrick" DefaultUserId = "00000000000000000000000001" ) diff --git a/test-e2e/run-test.sh b/test-e2e/run-test.sh index 4bf59bdbf..012b22bed 100755 --- a/test-e2e/run-test.sh +++ b/test-e2e/run-test.sh @@ -2,11 +2,6 @@ set -eo pipefail # Derrick end to end test runner - -# Builtin plugins and the plugin SDK both register plugin.proto; ignore instead of panic. -export GOLANG_PROTOBUF_REGISTRATION_CONFLICT="${GOLANG_PROTOBUF_REGISTRATION_CONFLICT:-ignore}" - -# shell spinner: https://www.shellscript.sh/tips/spinner/ spin() { spinner="/|\\-/|\\-" diff --git a/test-e2e/util.go b/test-e2e/util.go index f384e40f5..5dd76f9fb 100644 --- a/test-e2e/util.go +++ b/test-e2e/util.go @@ -17,30 +17,6 @@ import ( "github.com/pkg/errors" ) -var protoRegistrationWarning = regexp.MustCompile(`(?m)^WARNING: proto:\s+file "plugin\.proto" is already registered|^[\t ]*previously from:|^[\t ]*currently from:|^See https://developers\.google\.com/protocol-buffers/docs/reference/go/faq#namespace-conflict`) - -// filterBenignStderr removes known harmless stderr noise emitted when builtin -// plugins and the plugin SDK both register plugin.proto. -func filterBenignStderr(stderr string) string { - if stderr == "" { - return "" - } - - // Release binaries can emit non-breaking spaces (U+00A0) in proto warnings. - stderr = strings.ReplaceAll(stderr, "\u00a0", " ") - - var kept []string - for _, line := range strings.Split(stderr, "\n") { - line = strings.TrimSuffix(line, "\r") - if line == "" || protoRegistrationWarning.MatchString(line) { - continue - } - kept = append(kept, line) - } - - return strings.TrimSpace(strings.Join(kept, "\n")) -} - // Test config settings used by the tests var ( wpBinary = Getenv("DERRICK_BINARY", "derrick") @@ -75,7 +51,6 @@ func (b *binary) NewCmd(args ...string) *exec.Cmd { cmd.Env = append(cmd.Env, "CHECKPOINT_DISABLE=1", - "GOLANG_PROTOBUF_REGISTRATION_CONFLICT=ignore", ) return cmd } @@ -218,7 +193,7 @@ func (b *binary) RunRaw(args ...string) (stdout, stderr string, err error) { cmd.Stderr = &bytes.Buffer{} err = cmd.Run() stdout = cmd.Stdout.(*bytes.Buffer).String() - stderr = filterBenignStderr(cmd.Stderr.(*bytes.Buffer).String()) + stderr = cmd.Stderr.(*bytes.Buffer).String() return } diff --git a/test-e2e/util_test.go b/test-e2e/util_test.go deleted file mode 100644 index b9ff4f9c4..000000000 --- a/test-e2e/util_test.go +++ /dev/null @@ -1,67 +0,0 @@ -package test - -import ( - "strings" - "testing" -) - -func TestFilterBenignStderr(t *testing.T) { - t.Parallel() - - cases := []struct { - name string - stderr string - want string - }{ - { - name: "empty", - stderr: "", - want: "", - }, - { - name: "single proto warning", - stderr: `WARNING: proto: file "plugin.proto" is already registered`, - want: "", - }, - { - name: "proto warning with non-breaking space", - stderr: "WARNING: proto:\u00a0file \"plugin.proto\" is already registered", - want: "", - }, - { - name: "multiple proto warnings lf", - stderr: strings.Repeat(`WARNING: proto: file "plugin.proto" is already registered`+"\n", 3), - want: "", - }, - { - name: "multiple proto warnings crlf", - stderr: strings.Repeat(`WARNING: proto: file "plugin.proto" is already registered`+"\r\n", 3), - want: "", - }, - { - name: "proto warning with related lines", - stderr: `WARNING: proto: file "plugin.proto" is already registered - previously from: github.com/foo - currently from: github.com/bar -See https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict -`, - want: "", - }, - { - name: "real error preserved", - stderr: "ERROR: something went wrong\nWARNING: proto: file \"plugin.proto\" is already registered\n", - want: "ERROR: something went wrong", - }, - } - - for _, tc := range cases { - tc := tc - t.Run(tc.name, func(t *testing.T) { - t.Parallel() - got := filterBenignStderr(tc.stderr) - if got != tc.want { - t.Fatalf("filterBenignStderr() = %q, want %q", got, tc.want) - } - }) - } -}