From 285483f900c678990d4e1a2c9c32f68ebf821358 Mon Sep 17 00:00:00 2001 From: Sid Shukla Date: Fri, 16 Aug 2024 13:43:18 +0200 Subject: [PATCH] Cleanup workflow actions and update devbox dependencies (#475) * Cleanup workflow actions and update devbox dependencies - Use devbox install action instead of manually installing devbox - Update cache action to v4 - Update codecov action to v4 - Remove unnecessary nix flakes - Simplify the coverage output by removing unnecessary tools as codecov now understands coverage.out * Bump all devbox dependencies to latest regenerate all mocks with newer mockgen * Update manifests Run `make manifests` --- .github/workflows/build-dev.yaml | 24 +- Makefile | 11 +- ...ture.cluster.x-k8s.io_nutanixclusters.yaml | 124 ++-- ...ster.x-k8s.io_nutanixclustertemplates.yaml | 83 ++- ...ture.cluster.x-k8s.io_nutanixmachines.yaml | 190 +++--- ...ster.x-k8s.io_nutanixmachinetemplates.yaml | 122 ++-- controllers/helpers_test.go | 2 +- controllers/nutanixcluster_controller_test.go | 2 +- controllers/nutanixmachine_controller_test.go | 2 +- devbox.json | 31 +- devbox.lock | 574 +++++++++++++++--- go.mod | 1 + go.sum | 2 + hack/flakes/flake.lock | 12 +- hack/flakes/flake.nix | 51 -- main_test.go | 2 +- mocks/ctlclient/cache_mock.go | 39 +- mocks/ctlclient/client_mock.go | 55 +- mocks/ctlclient/manager_mock.go | 17 +- mocks/k8sapimachinery/interfaces.go | 29 +- mocks/k8sclient/informer.go | 7 +- mocks/k8sclient/lister.go | 15 +- mocks/nutanix/v3.go | 229 +++---- pkg/context/context_test.go | 2 +- 24 files changed, 1006 insertions(+), 620 deletions(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index d5e2d179a9..890836481b 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -16,7 +16,12 @@ jobs: with: ref: "${{ github.event.pull_request.head.sha }}" - - uses: actions/cache@v3 + - name: Install devbox + uses: jetify-com/devbox-install-action@v0.11.0 + with: + enable-cache: "true" + + - uses: actions/cache@v4 with: path: | ~/.cache/golangci-lint @@ -26,12 +31,6 @@ jobs: restore-keys: | ${{ runner.os }}-go- - - name: Install devbox - run: curl -fsSL https://get.jetpack.io/devbox | bash -s -- -f - - - name: Install devbox deps - run: devbox install - - name: Verify that generated manifests committed to the repository are up to date run: devbox run -- make verify-manifests @@ -52,20 +51,15 @@ jobs: - name: Run unit tests run: devbox run -- make unit-test - # gocov-xml expects things to be properly placed under go path. - # GHA clones into /home/runner/work/repository so we create - # the directory under the right path and link it - - run: mkdir -p /home/runner/go/src/github.com/nutanix-cloud-native/ && ln -s /home/runner/work/cluster-api-provider-nutanix/cluster-api-provider-nutanix /home/runner/go/src/github.com/nutanix-cloud-native - - name: Run coverage report - run: devbox run -- "make coverage" + run: devbox run -- make coverage - name: Codecov - uses: codecov/codecov-action@v3.1.4 + uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: - file: ./coverage.xml # Replace with the path to your coverage report + file: ./coverage.out # Replace with the path to your coverage report fail_ci_if_error: true - name: Run Trivy vulnerability scanner diff --git a/Makefile b/Makefile index 7479e1fa05..f0d4709729 100644 --- a/Makefile +++ b/Makefile @@ -325,18 +325,11 @@ GOTESTPKGS = $(shell go list ./... | grep -v /mocks | grep -v /templates) .PHONY: unit-test unit-test: mocks ## Run unit tests. -ifeq ($(EXPORT_RESULT), true) - $(eval OUTPUT_OPTIONS = | go-junit-report -set-exit-code > junit-report.xml) -endif - KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --arch=amd64 -p path)" $(GOTEST) $(GOTESTPKGS) $(OUTPUT_OPTIONS) + KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --arch=amd64 -p path)" $(GOTEST) $(GOTESTPKGS) .PHONY: coverage coverage: mocks ## Run the tests of the project and export the coverage - KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --arch=amd64 -p path)" $(GOTEST) -cover -covermode=count -coverprofile=profile.cov $(GOTESTPKGS) - $(GOTOOL) cover -func profile.cov -ifeq ($(EXPORT_RESULT), true) - gocov convert profile.cov | gocov-xml > coverage.xml -endif + KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --arch=amd64 -p path)" $(GOTEST) -race -coverprofile=coverage.out -covermode=atomic $(GOTESTPKGS) .PHONY: template-test template-test: docker-build prepare-local-clusterctl ## Run the template tests diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclusters.yaml index 799c782995..e92c989234 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: nutanixclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -33,14 +33,19 @@ spec: description: NutanixCluster is the Schema for the nutanixclusters API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -48,9 +53,9 @@ spec: description: NutanixClusterSpec defines the desired state of NutanixCluster properties: controlPlaneEndpoint: - description: ControlPlaneEndpoint represents the endpoint used to - communicate with the control plane. host can be either DNS name - or ip address + description: |- + ControlPlaneEndpoint represents the endpoint used to communicate with the control plane. + host can be either DNS name or ip address properties: host: description: The hostname on which the API server is serving. @@ -64,20 +69,19 @@ spec: - port type: object failureDomains: - description: failureDomains configures failure domains information - for the Nutanix platform. When set, the failure domains defined - here may be used to spread Machines across prism element clusters - to improve fault tolerance of the cluster. + description: |- + failureDomains configures failure domains information for the Nutanix platform. + When set, the failure domains defined here may be used to spread Machines across + prism element clusters to improve fault tolerance of the cluster. items: description: NutanixFailureDomain configures failure domain information for Nutanix. properties: cluster: - description: cluster is to identify the cluster (the Prism Element - under management of the Prism Central), in which the Machine's - VM will be created. The cluster identifier (uuid or name) - can be obtained from the Prism Central console or using the - prism_central API. + description: |- + cluster is to identify the cluster (the Prism Element under management of the Prism Central), + in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained + from the Prism Central console or using the prism_central API. properties: name: description: name is the resource name in the PC @@ -100,22 +104,21 @@ spec: plane nodes type: boolean name: - description: name defines the unique name of a failure domain. + description: |- + name defines the unique name of a failure domain. Name is required and must be at most 64 characters in length. - It must consist of only lower case alphanumeric characters - and hyphens (-). It must start and end with an alphanumeric - character. This value is arbitrary and is used to identify - the failure domain within the platform. + It must consist of only lower case alphanumeric characters and hyphens (-). + It must start and end with an alphanumeric character. + This value is arbitrary and is used to identify the failure domain within the platform. maxLength: 64 minLength: 1 pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?' type: string subnets: - description: subnets holds a list of identifiers (one or more) - of the cluster's network subnets for the Machine's VM to connect - to. The subnet identifiers (uuid or name) can be obtained - from the Prism Central console or using the prism_central - API. + description: |- + subnets holds a list of identifiers (one or more) of the cluster's network subnets + for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be + obtained from the Prism Central console or using the prism_central API. items: description: NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, etc.) @@ -148,18 +151,17 @@ spec: - name x-kubernetes-list-type: map prismCentral: - description: prismCentral holds the endpoint address and port to access - the Nutanix Prism Central. When a cluster-wide proxy is installed, - by default, this endpoint will be accessed via the proxy. Should - you wish for communication with this endpoint not to be proxied, - please add the endpoint to the proxy spec.noProxy list. + description: |- + prismCentral holds the endpoint address and port to access the Nutanix Prism Central. + When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. + Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the + proxy spec.noProxy list. properties: additionalTrustBundle: - description: AdditionalTrustBundle is a PEM encoded x509 cert - for the RootCA that was used to create the certificate for a - Prism Central that uses certificates that were issued by a non-publicly - trusted RootCA. The trust bundle is added to the cert pool used - to authenticate the TLS connection to the Prism Central. + description: |- + AdditionalTrustBundle is a PEM encoded x509 cert for the RootCA that was used to create the certificate + for a Prism Central that uses certificates that were issued by a non-publicly trusted RootCA. The trust + bundle is added to the cert pool used to authenticate the TLS connection to the Prism Central. properties: data: description: Data of the trust bundle if Kind is String. @@ -231,37 +233,37 @@ spec: operational state. properties: lastTransitionTime: - description: Last time the condition transitioned from one status - to another. This should be when the underlying condition changed. - If that is not known, then using the time when the API field - changed is acceptable. + description: |- + Last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when + the API field changed is acceptable. format: date-time type: string message: - description: A human readable message indicating details about - the transition. This field may be empty. + description: |- + A human readable message indicating details about the transition. + This field may be empty. type: string reason: - description: The reason for the condition's last transition - in CamelCase. The specific API may choose whether or not this - field is considered a guaranteed API. This field may not be - empty. + description: |- + The reason for the condition's last transition in CamelCase. + The specific API may choose whether or not this field is considered a guaranteed API. + This field may not be empty. type: string severity: - description: Severity provides an explicit classification of - Reason code, so the users or machines can immediately understand - the current situation and act accordingly. The Severity field - MUST be set only when Status=False. + description: |- + Severity provides an explicit classification of Reason code, so the users or machines can immediately + understand the current situation and act accordingly. + The Severity field MUST be set only when Status=False. type: string status: description: Status of the condition, one of True, False, Unknown. type: string type: - description: Type of condition in CamelCase or in foo.example.com/CamelCase. - Many .condition.type values are consistent across resources - like Available, but because arbitrary conditions can be useful - (see .node.status.conditions), the ability to deconflict is - important. + description: |- + Type of condition in CamelCase or in foo.example.com/CamelCase. + Many .condition.type values are consistent across resources like Available, but because arbitrary conditions + can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: - lastTransitionTime @@ -271,9 +273,9 @@ spec: type: array failureDomains: additionalProperties: - description: FailureDomainSpec is the Schema for Cluster API failure - domains. It allows controllers to understand how many failure - domains a cluster can optionally span across. + description: |- + FailureDomainSpec is the Schema for Cluster API failure domains. + It allows controllers to understand how many failure domains a cluster can optionally span across. properties: attributes: additionalProperties: diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml index b39865a4e1..3fa8eb8183 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: nutanixclustertemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,14 +23,19 @@ spec: API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -45,9 +50,9 @@ spec: description: NutanixClusterSpec defines the desired state of NutanixCluster properties: controlPlaneEndpoint: - description: ControlPlaneEndpoint represents the endpoint - used to communicate with the control plane. host can be - either DNS name or ip address + description: |- + ControlPlaneEndpoint represents the endpoint used to communicate with the control plane. + host can be either DNS name or ip address properties: host: description: The hostname on which the API server is serving. @@ -61,20 +66,19 @@ spec: - port type: object failureDomains: - description: failureDomains configures failure domains information - for the Nutanix platform. When set, the failure domains - defined here may be used to spread Machines across prism - element clusters to improve fault tolerance of the cluster. + description: |- + failureDomains configures failure domains information for the Nutanix platform. + When set, the failure domains defined here may be used to spread Machines across + prism element clusters to improve fault tolerance of the cluster. items: description: NutanixFailureDomain configures failure domain information for Nutanix. properties: cluster: - description: cluster is to identify the cluster (the - Prism Element under management of the Prism Central), - in which the Machine's VM will be created. The cluster - identifier (uuid or name) can be obtained from the - Prism Central console or using the prism_central API. + description: |- + cluster is to identify the cluster (the Prism Element under management of the Prism Central), + in which the Machine's VM will be created. The cluster identifier (uuid or name) can be obtained + from the Prism Central console or using the prism_central API. properties: name: description: name is the resource name in the PC @@ -98,23 +102,21 @@ spec: for control plane nodes type: boolean name: - description: name defines the unique name of a failure - domain. Name is required and must be at most 64 characters - in length. It must consist of only lower case alphanumeric - characters and hyphens (-). It must start and end - with an alphanumeric character. This value is arbitrary - and is used to identify the failure domain within - the platform. + description: |- + name defines the unique name of a failure domain. + Name is required and must be at most 64 characters in length. + It must consist of only lower case alphanumeric characters and hyphens (-). + It must start and end with an alphanumeric character. + This value is arbitrary and is used to identify the failure domain within the platform. maxLength: 64 minLength: 1 pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?' type: string subnets: - description: subnets holds a list of identifiers (one - or more) of the cluster's network subnets for the - Machine's VM to connect to. The subnet identifiers - (uuid or name) can be obtained from the Prism Central - console or using the prism_central API. + description: |- + subnets holds a list of identifiers (one or more) of the cluster's network subnets + for the Machine's VM to connect to. The subnet identifiers (uuid or name) can be + obtained from the Prism Central console or using the prism_central API. items: description: NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, @@ -150,20 +152,17 @@ spec: - name x-kubernetes-list-type: map prismCentral: - description: prismCentral holds the endpoint address and port - to access the Nutanix Prism Central. When a cluster-wide - proxy is installed, by default, this endpoint will be accessed - via the proxy. Should you wish for communication with this - endpoint not to be proxied, please add the endpoint to the + description: |- + prismCentral holds the endpoint address and port to access the Nutanix Prism Central. + When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy. + Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the proxy spec.noProxy list. properties: additionalTrustBundle: - description: AdditionalTrustBundle is a PEM encoded x509 - cert for the RootCA that was used to create the certificate - for a Prism Central that uses certificates that were - issued by a non-publicly trusted RootCA. The trust bundle - is added to the cert pool used to authenticate the TLS - connection to the Prism Central. + description: |- + AdditionalTrustBundle is a PEM encoded x509 cert for the RootCA that was used to create the certificate + for a Prism Central that uses certificates that were issued by a non-publicly trusted RootCA. The trust + bundle is added to the cert pool used to authenticate the TLS connection to the Prism Central. properties: data: description: Data of the trust bundle if Kind is String. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachines.yaml index 7218cece13..8bfdd476ce 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachines.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: nutanixmachines.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -37,14 +37,19 @@ spec: description: NutanixMachine is the Schema for the nutanixmachines API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -73,48 +78,57 @@ spec: - uefi type: string bootstrapRef: - description: BootstrapRef is a reference to a bootstrap provider-specific - resource that holds configuration details. + description: |- + BootstrapRef is a reference to a bootstrap provider-specific resource + that holds configuration details. properties: apiVersion: description: API version of the referent. type: string fieldPath: - description: 'If referring to a piece of an object instead of - an entire object, this string should contain a valid JSON/Go - field access statement, such as desiredState.manifest.containers[2]. - For example, if the object reference is to a container within - a pod, this would take on a value like: "spec.containers{name}" - (where "name" refers to the name of the container that triggered - the event) or if no container name is specified "spec.containers[2]" - (container with index 2 in this pod). This syntax is chosen - only to have some well-defined way of referencing a part of - an object. TODO: this design is not final and this field is - subject to change in the future.' + description: |- + If referring to a piece of an object instead of an entire object, this string + should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container within a pod, this would take on a value like: + "spec.containers{name}" (where "name" refers to the name of the container that triggered + the event) or if no container name is specified "spec.containers[2]" (container with + index 2 in this pod). This syntax is chosen only to have some well-defined way of + referencing a part of an object. + TODO: this design is not final and this field is subject to change in the future. type: string kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind of the referent. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + description: |- + Namespace of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ type: string resourceVersion: - description: 'Specific resourceVersion to which this reference - is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + description: |- + Specific resourceVersion to which this reference is made, if any. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency type: string uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + description: |- + UID of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids type: string type: object x-kubernetes-map-type: atomic cluster: - description: cluster is to identify the cluster (the Prism Element - under management of the Prism Central), in which the Machine's VM - will be created. The cluster identifier (uuid or name) can be obtained - from the Prism Central console or using the prism_central API. + description: |- + cluster is to identify the cluster (the Prism Element under management + of the Prism Central), in which the Machine's VM will be created. + The cluster identifier (uuid or name) can be obtained from the Prism Central console + or using the prism_central API. properties: name: description: name is the resource name in the PC @@ -153,9 +167,10 @@ spec: type: object type: array image: - description: image is to identify the rhcos image uploaded to the - Prism Central (PC) The image identifier (uuid or name) can be obtained - from the Prism Central console or using the prism_central API. + description: |- + image is to identify the rhcos image uploaded to the Prism Central (PC) + The image identifier (uuid or name) can be obtained from the Prism Central console + or using the prism_central API. properties: name: description: name is the resource name in the PC @@ -176,8 +191,9 @@ spec: anyOf: - type: integer - type: string - description: memorySize is the memory size (in Quantity format) of - the VM The minimum memorySize is 2Gi bytes + description: |- + memorySize is the memory size (in Quantity format) of the VM + The minimum memorySize is 2Gi bytes pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true project: @@ -203,10 +219,10 @@ spec: cloud provider. type: string subnet: - description: subnet is to identify the cluster's network subnet to - use for the Machine's VM The cluster identifier (uuid or name) can - be obtained from the Prism Central console or using the prism_central - API. + description: |- + subnet is to identify the cluster's network subnet to use for the Machine's VM + The cluster identifier (uuid or name) can be obtained from the Prism Central console + or using the prism_central API. items: description: NutanixResourceIdentifier holds the identity of a Nutanix PC resource (cluster, image, subnet, etc.) @@ -231,8 +247,9 @@ spec: anyOf: - type: integer - type: string - description: systemDiskSize is size (in Quantity format) of the system - disk of the VM The minimum systemDiskSize is 20Gi bytes + description: |- + systemDiskSize is size (in Quantity format) of the system disk of the VM + The minimum systemDiskSize is 20Gi bytes pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true vcpuSockets: @@ -257,9 +274,9 @@ spec: description: NutanixMachineStatus defines the observed state of NutanixMachine properties: addresses: - description: Addresses contains the Nutanix VM associated addresses. - Address type is one of Hostname, ExternalIP, InternalIP, ExternalDNS, - InternalDNS + description: |- + Addresses contains the Nutanix VM associated addresses. + Address type is one of Hostname, ExternalIP, InternalIP, ExternalDNS, InternalDNS items: description: MachineAddress contains information for the node's address. @@ -283,37 +300,37 @@ spec: operational state. properties: lastTransitionTime: - description: Last time the condition transitioned from one status - to another. This should be when the underlying condition changed. - If that is not known, then using the time when the API field - changed is acceptable. + description: |- + Last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when + the API field changed is acceptable. format: date-time type: string message: - description: A human readable message indicating details about - the transition. This field may be empty. + description: |- + A human readable message indicating details about the transition. + This field may be empty. type: string reason: - description: The reason for the condition's last transition - in CamelCase. The specific API may choose whether or not this - field is considered a guaranteed API. This field may not be - empty. + description: |- + The reason for the condition's last transition in CamelCase. + The specific API may choose whether or not this field is considered a guaranteed API. + This field may not be empty. type: string severity: - description: Severity provides an explicit classification of - Reason code, so the users or machines can immediately understand - the current situation and act accordingly. The Severity field - MUST be set only when Status=False. + description: |- + Severity provides an explicit classification of Reason code, so the users or machines can immediately + understand the current situation and act accordingly. + The Severity field MUST be set only when Status=False. type: string status: description: Status of the condition, one of True, False, Unknown. type: string type: - description: Type of condition in CamelCase or in foo.example.com/CamelCase. - Many .condition.type values are consistent across resources - like Available, but because arbitrary conditions can be useful - (see .node.status.conditions), the ability to deconflict is - important. + description: |- + Type of condition in CamelCase or in foo.example.com/CamelCase. + Many .condition.type values are consistent across resources like Available, but because arbitrary conditions + can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: - lastTransitionTime @@ -328,41 +345,48 @@ spec: description: Will be set in case of failure of Machine instance type: string nodeRef: - description: 'NodeRef is a reference to the corresponding workload - cluster Node if it exists. Deprecated: Do not use. Will be removed - in a future release.' + description: |- + NodeRef is a reference to the corresponding workload cluster Node if it exists. + Deprecated: Do not use. Will be removed in a future release. properties: apiVersion: description: API version of the referent. type: string fieldPath: - description: 'If referring to a piece of an object instead of - an entire object, this string should contain a valid JSON/Go - field access statement, such as desiredState.manifest.containers[2]. - For example, if the object reference is to a container within - a pod, this would take on a value like: "spec.containers{name}" - (where "name" refers to the name of the container that triggered - the event) or if no container name is specified "spec.containers[2]" - (container with index 2 in this pod). This syntax is chosen - only to have some well-defined way of referencing a part of - an object. TODO: this design is not final and this field is - subject to change in the future.' + description: |- + If referring to a piece of an object instead of an entire object, this string + should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container within a pod, this would take on a value like: + "spec.containers{name}" (where "name" refers to the name of the container that triggered + the event) or if no container name is specified "spec.containers[2]" (container with + index 2 in this pod). This syntax is chosen only to have some well-defined way of + referencing a part of an object. + TODO: this design is not final and this field is subject to change in the future. type: string kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind of the referent. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + description: |- + Namespace of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ type: string resourceVersion: - description: 'Specific resourceVersion to which this reference - is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + description: |- + Specific resourceVersion to which this reference is made, if any. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency type: string uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + description: |- + UID of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids type: string type: object x-kubernetes-map-type: atomic diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachinetemplates.yaml index 53e0a18c9a..6714d42fa0 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixmachinetemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.14.0 name: nutanixmachinetemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -25,14 +25,19 @@ spec: API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -44,24 +49,27 @@ spec: to create a NutanixMachine from a template properties: metadata: - description: 'Standard object metadata. Ref: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' + description: |- + Standard object metadata. + Ref: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata properties: annotations: additionalProperties: type: string - description: 'Annotations is an unstructured key value map - stored with a resource that may be set by external tools - to store and retrieve arbitrary metadata. They are not queryable - and should be preserved when modifying objects. More info: - http://kubernetes.io/docs/user-guide/annotations' + description: |- + Annotations is an unstructured key value map stored with a resource that may be + set by external tools to store and retrieve arbitrary metadata. They are not + queryable and should be preserved when modifying objects. + More info: http://kubernetes.io/docs/user-guide/annotations type: object labels: additionalProperties: type: string - description: 'Map of string keys and values that can be used - to organize and categorize (scope and select) objects. May - match selectors of replication controllers and services. - More info: http://kubernetes.io/docs/user-guide/labels' + description: |- + Map of string keys and values that can be used to organize and categorize + (scope and select) objects. May match selectors of replication controllers + and services. + More info: http://kubernetes.io/docs/user-guide/labels type: object type: object spec: @@ -90,49 +98,56 @@ spec: - uefi type: string bootstrapRef: - description: BootstrapRef is a reference to a bootstrap provider-specific - resource that holds configuration details. + description: |- + BootstrapRef is a reference to a bootstrap provider-specific resource + that holds configuration details. properties: apiVersion: description: API version of the referent. type: string fieldPath: - description: 'If referring to a piece of an object instead - of an entire object, this string should contain a valid - JSON/Go field access statement, such as desiredState.manifest.containers[2]. - For example, if the object reference is to a container - within a pod, this would take on a value like: "spec.containers{name}" - (where "name" refers to the name of the container that - triggered the event) or if no container name is specified - "spec.containers[2]" (container with index 2 in this - pod). This syntax is chosen only to have some well-defined - way of referencing a part of an object. TODO: this design - is not final and this field is subject to change in - the future.' + description: |- + If referring to a piece of an object instead of an entire object, this string + should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container within a pod, this would take on a value like: + "spec.containers{name}" (where "name" refers to the name of the container that triggered + the event) or if no container name is specified "spec.containers[2]" (container with + index 2 in this pod). This syntax is chosen only to have some well-defined way of + referencing a part of an object. + TODO: this design is not final and this field is subject to change in the future. type: string kind: - description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind of the referent. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names type: string namespace: - description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + description: |- + Namespace of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/ type: string resourceVersion: - description: 'Specific resourceVersion to which this reference - is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + description: |- + Specific resourceVersion to which this reference is made, if any. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency type: string uid: - description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + description: |- + UID of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids type: string type: object x-kubernetes-map-type: atomic cluster: - description: cluster is to identify the cluster (the Prism - Element under management of the Prism Central), in which - the Machine's VM will be created. The cluster identifier - (uuid or name) can be obtained from the Prism Central console + description: |- + cluster is to identify the cluster (the Prism Element under management + of the Prism Central), in which the Machine's VM will be created. + The cluster identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API. properties: name: @@ -175,10 +190,10 @@ spec: type: object type: array image: - description: image is to identify the rhcos image uploaded - to the Prism Central (PC) The image identifier (uuid or - name) can be obtained from the Prism Central console or - using the prism_central API. + description: |- + image is to identify the rhcos image uploaded to the Prism Central (PC) + The image identifier (uuid or name) can be obtained from the Prism Central console + or using the prism_central API. properties: name: description: name is the resource name in the PC @@ -200,8 +215,9 @@ spec: anyOf: - type: integer - type: string - description: memorySize is the memory size (in Quantity format) - of the VM The minimum memorySize is 2Gi bytes + description: |- + memorySize is the memory size (in Quantity format) of the VM + The minimum memorySize is 2Gi bytes pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true project: @@ -229,9 +245,9 @@ spec: by the cloud provider. type: string subnet: - description: subnet is to identify the cluster's network subnet - to use for the Machine's VM The cluster identifier (uuid - or name) can be obtained from the Prism Central console + description: |- + subnet is to identify the cluster's network subnet to use for the Machine's VM + The cluster identifier (uuid or name) can be obtained from the Prism Central console or using the prism_central API. items: description: NutanixResourceIdentifier holds the identity @@ -259,9 +275,9 @@ spec: anyOf: - type: integer - type: string - description: systemDiskSize is size (in Quantity format) of - the system disk of the VM The minimum systemDiskSize is - 20Gi bytes + description: |- + systemDiskSize is size (in Quantity format) of the system disk of the VM + The minimum systemDiskSize is 20Gi bytes pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true vcpuSockets: diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go index 7b5f0027c5..5093b40981 100644 --- a/controllers/helpers_test.go +++ b/controllers/helpers_test.go @@ -22,13 +22,13 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" credentialtypes "github.com/nutanix-cloud-native/prism-go-client/environment/credentials" prismclientv3 "github.com/nutanix-cloud-native/prism-go-client/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/cluster-api/util" diff --git a/controllers/nutanixcluster_controller_test.go b/controllers/nutanixcluster_controller_test.go index a559acb1bf..3c5319c370 100644 --- a/controllers/nutanixcluster_controller_test.go +++ b/controllers/nutanixcluster_controller_test.go @@ -21,13 +21,13 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" credentialtypes "github.com/nutanix-cloud-native/prism-go-client/environment/credentials" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/controllers/nutanixmachine_controller_test.go b/controllers/nutanixmachine_controller_test.go index 00031fa014..3ab2a46d0d 100644 --- a/controllers/nutanixmachine_controller_test.go +++ b/controllers/nutanixmachine_controller_test.go @@ -21,7 +21,6 @@ import ( "errors" "testing" - "github.com/golang/mock/gomock" credentialTypes "github.com/nutanix-cloud-native/prism-go-client/environment/credentials" prismclientv3 "github.com/nutanix-cloud-native/prism-go-client/v3" "github.com/nutanix-cloud-native/prism-go-client/v3/models" @@ -29,6 +28,7 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/devbox.json b/devbox.json index a9585298dc..951408e650 100644 --- a/devbox.json +++ b/devbox.json @@ -2,28 +2,25 @@ "packages": [ "bash@latest", "coreutils@latest", - "clusterctl@1.6.2", - "envsubst@1.4.2", + "clusterctl@latest", + "envsubst@latest", "fping@latest", - "gnumake@4.4.1", - "ginkgo@2.19.0", - "go@1.22.1", - "golangci-lint@1.59.1", - "gotestsum@1.6.4", + "gnumake@latest", + "ginkgo@latest", + "go@latest", + "golangci-lint@latest", + "gotestsum@latest", "kubernetes-helm@latest", - "kind@0.23.0", - "ko@0.15.2", + "kind@latest", + "ko@latest", "kubectl@latest", - "kubernetes-code-generator@0.25.4", - "kubernetes-controller-tools@0.13.0", - "kustomize@5.3.0", - "mockgen@1.6.0", - "yamllint@1.35.1", + "kubernetes-code-generator@latest", + "kubernetes-controller-tools@latest", + "kustomize@latest", + "mockgen@latest", + "yamllint@latest", "path:./hack/flakes#go-apidiff", "path:./hack/flakes#go-mod-upgrade", - "path:./hack/flakes#go-junit-report", - "path:./hack/flakes#gocov", - "path:./hack/flakes#gocov-xml", "path:./hack/flakes#yamllint-checkstyle", "path:./hack/flakes#setup-envtest" ] diff --git a/devbox.lock b/devbox.lock index ef24927764..f4e4993c1d 100644 --- a/devbox.lock +++ b/devbox.lock @@ -21,23 +21,51 @@ } } }, - "clusterctl@1.6.2": { - "last_modified": "2024-03-02T05:21:12Z", - "resolved": "github:NixOS/nixpkgs/458b097d81f90275b3fdf03796f0563844926708#clusterctl", + "clusterctl@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#clusterctl", "source": "devbox-search", - "version": "1.6.2", + "version": "1.7.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/01zxwnxgnzdsav8i05j68hq8ai12d1av-clusterctl-1.6.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/iv4w4acwl5gpp3cr4vmnx0950gp4374q-clusterctl-1.7.4", + "default": true + } + ], + "store_path": "/nix/store/iv4w4acwl5gpp3cr4vmnx0950gp4374q-clusterctl-1.7.4" }, "aarch64-linux": { - "store_path": "/nix/store/k9rrpp3zzbg5jqwn1y8lkzpyg98blf6d-clusterctl-1.6.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/h93rjqmlj512y5s5c7x1kpglmh2qqmnx-clusterctl-1.7.4", + "default": true + } + ], + "store_path": "/nix/store/h93rjqmlj512y5s5c7x1kpglmh2qqmnx-clusterctl-1.7.4" }, "x86_64-darwin": { - "store_path": "/nix/store/62i8qdhgaf0j03n795mg3ijp13sjkgm2-clusterctl-1.6.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/04zp653g5111aa81wicdlaivmjcgn7ns-clusterctl-1.7.4", + "default": true + } + ], + "store_path": "/nix/store/04zp653g5111aa81wicdlaivmjcgn7ns-clusterctl-1.7.4" }, "x86_64-linux": { - "store_path": "/nix/store/my6z8i9qcfnz8n7w3iqmqadm0ykf2r0h-clusterctl-1.6.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/xv42ciazaaz8qs31gj89gfy0ghvjjdd6-clusterctl-1.7.4", + "default": true + } + ], + "store_path": "/nix/store/xv42ciazaaz8qs31gj89gfy0ghvjjdd6-clusterctl-1.7.4" } } }, @@ -113,23 +141,51 @@ } } }, - "envsubst@1.4.2": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#envsubst", + "envsubst@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#envsubst", "source": "devbox-search", "version": "1.4.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/h1laqcsa8gr1alfvc5yn4gvga0hz1hab-envsubst-1.4.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/shbpgijq30463mwd130v8ps5r3srwrhl-envsubst-1.4.2", + "default": true + } + ], + "store_path": "/nix/store/shbpgijq30463mwd130v8ps5r3srwrhl-envsubst-1.4.2" }, "aarch64-linux": { - "store_path": "/nix/store/4dibwjadh7cjw16sr6a8nfyavh08fmds-envsubst-1.4.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/wq0z5swg3yhnmh9i7wjwp9nlhb5vlvvf-envsubst-1.4.2", + "default": true + } + ], + "store_path": "/nix/store/wq0z5swg3yhnmh9i7wjwp9nlhb5vlvvf-envsubst-1.4.2" }, "x86_64-darwin": { - "store_path": "/nix/store/47flhksbc9zrdric9n2nhvrvpd3np0aj-envsubst-1.4.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/5f9ywjnpxawwjv1rsw757jjjkhby0pkr-envsubst-1.4.2", + "default": true + } + ], + "store_path": "/nix/store/5f9ywjnpxawwjv1rsw757jjjkhby0pkr-envsubst-1.4.2" }, "x86_64-linux": { - "store_path": "/nix/store/i2igkw4d5fijqhfdqhyayfb0y4h9g4z7-envsubst-1.4.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/0bvggbkrg2gagl6agx481npzs9fqhxh9-envsubst-1.4.2", + "default": true + } + ], + "store_path": "/nix/store/0bvggbkrg2gagl6agx481npzs9fqhxh9-envsubst-1.4.2" } } }, @@ -181,95 +237,195 @@ } } }, - "ginkgo@2.19.0": { - "last_modified": "2024-07-07T07:43:47Z", - "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#ginkgo", + "ginkgo@latest": { + "last_modified": "2024-07-27T00:41:21Z", + "resolved": "github:NixOS/nixpkgs/48bacf585a51d953def8bff32087970f273052e2#ginkgo", "source": "devbox-search", - "version": "2.19.0", + "version": "2.19.1", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/0df3v1l69507ch21m4f5yjmqph6njr2a-ginkgo-2.19.0", + "path": "/nix/store/83hiwfi19f1gr0r4fhl957jyw65wvaig-ginkgo-2.19.1", "default": true } ], - "store_path": "/nix/store/0df3v1l69507ch21m4f5yjmqph6njr2a-ginkgo-2.19.0" + "store_path": "/nix/store/83hiwfi19f1gr0r4fhl957jyw65wvaig-ginkgo-2.19.1" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/n71yvwix1rkji7y2p0hird6rzxnb7hly-ginkgo-2.19.0", + "path": "/nix/store/i2qip2zd28vlqr1wcjpgiq7fd59dlsly-ginkgo-2.19.1", "default": true } ], - "store_path": "/nix/store/n71yvwix1rkji7y2p0hird6rzxnb7hly-ginkgo-2.19.0" + "store_path": "/nix/store/i2qip2zd28vlqr1wcjpgiq7fd59dlsly-ginkgo-2.19.1" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/hhr3kz63pcpvbrhlsvwrriqwdkyqi1dw-ginkgo-2.19.0", + "path": "/nix/store/7syipz9ww08qy7yivavpjxxrslhq4aqx-ginkgo-2.19.1", "default": true } ], - "store_path": "/nix/store/hhr3kz63pcpvbrhlsvwrriqwdkyqi1dw-ginkgo-2.19.0" + "store_path": "/nix/store/7syipz9ww08qy7yivavpjxxrslhq4aqx-ginkgo-2.19.1" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/8dkncfjlj1iavhvc5bym480c9asazlgh-ginkgo-2.19.0", + "path": "/nix/store/pyi1ih2c13rnkn1c04clbx9nxqbrfzwj-ginkgo-2.19.1", "default": true } ], - "store_path": "/nix/store/8dkncfjlj1iavhvc5bym480c9asazlgh-ginkgo-2.19.0" + "store_path": "/nix/store/pyi1ih2c13rnkn1c04clbx9nxqbrfzwj-ginkgo-2.19.1" } } }, - "gnumake@4.4.1": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#gnumake", + "gnumake@latest": { + "last_modified": "2024-07-07T07:43:47Z", + "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#gnumake", "source": "devbox-search", "version": "4.4.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/zck5w8rnl19lmhd7yziklfy9k8d27b78-gnumake-4.4.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/c4301v1sjrp1779626h44pl91jbnpn5r-gnumake-4.4.1", + "default": true + }, + { + "name": "man", + "path": "/nix/store/ajpqp6akrszzdvxbb40fq6czikidc2vb-gnumake-4.4.1-man", + "default": true + }, + { + "name": "info", + "path": "/nix/store/qs7gmbv88h9v6achca5950a33zmniabc-gnumake-4.4.1-info" + } + ], + "store_path": "/nix/store/c4301v1sjrp1779626h44pl91jbnpn5r-gnumake-4.4.1" }, "aarch64-linux": { - "store_path": "/nix/store/bgiym6xlq879xc1d9igqfb3m5apnvmay-gnumake-4.4.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/zm3bz71h77594dnry2v5q6rd6wyb6j4y-gnumake-4.4.1", + "default": true + }, + { + "name": "man", + "path": "/nix/store/ww1zz6d9lbypwxfg1187f9l2qj16abp9-gnumake-4.4.1-man", + "default": true + }, + { + "name": "debug", + "path": "/nix/store/2jmxd53sms6h9z95i5rl54s6899pb2ix-gnumake-4.4.1-debug" + }, + { + "name": "info", + "path": "/nix/store/5aq5k0fl2w43iwlfqn4jy3hpbxl7sh9y-gnumake-4.4.1-info" + } + ], + "store_path": "/nix/store/zm3bz71h77594dnry2v5q6rd6wyb6j4y-gnumake-4.4.1" }, "x86_64-darwin": { - "store_path": "/nix/store/m22igvglfrfgfp1hghm3k6b294yfsbkc-gnumake-4.4.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/6mq2psv6b3kraaf1axdw2h1ci28nw15l-gnumake-4.4.1", + "default": true + }, + { + "name": "man", + "path": "/nix/store/xmif4yq2xqy37qjhgzz43sni8nrickh6-gnumake-4.4.1-man", + "default": true + }, + { + "name": "info", + "path": "/nix/store/44kyl5f1z3qji74bjfj69anqnhhia5q0-gnumake-4.4.1-info" + } + ], + "store_path": "/nix/store/6mq2psv6b3kraaf1axdw2h1ci28nw15l-gnumake-4.4.1" }, "x86_64-linux": { - "store_path": "/nix/store/3bghwhn9ymgxmxcd1igbcvsl4234hvfb-gnumake-4.4.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/y1p3w7pj0f7n77kl33wmz5gml6qcqfjd-gnumake-4.4.1", + "default": true + }, + { + "name": "man", + "path": "/nix/store/qrbxn3bh9p4ivq5jx2fs6l34k0inqpz2-gnumake-4.4.1-man", + "default": true + }, + { + "name": "debug", + "path": "/nix/store/1rpvn74fg0vyp7k3r369qa6m0jqhsgiz-gnumake-4.4.1-debug" + }, + { + "name": "info", + "path": "/nix/store/561k9y7cqfyf58j9x1dblw0c18625xyd-gnumake-4.4.1-info" + } + ], + "store_path": "/nix/store/y1p3w7pj0f7n77kl33wmz5gml6qcqfjd-gnumake-4.4.1" } } }, - "go@1.22.1": { - "last_modified": "2024-03-06T17:57:40Z", - "resolved": "github:NixOS/nixpkgs/58ae79ea707579c40102ddf62d84b902a987c58b#go_1_22", + "go@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#go", "source": "devbox-search", - "version": "1.22.1", + "version": "1.22.5", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/q955gd41jh08l5pgbmx7y5jlqwwk4rqk-go-1.22.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/05saqcgidraqmn4z82prsp7rbj9hjmwm-go-1.22.5", + "default": true + } + ], + "store_path": "/nix/store/05saqcgidraqmn4z82prsp7rbj9hjmwm-go-1.22.5" }, "aarch64-linux": { - "store_path": "/nix/store/ca92iff1jpd9a3l3i8222rzbkq949mlh-go-1.22.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/b97bbxn6kpysysxb8nxn4k39ffxmp4p6-go-1.22.5", + "default": true + } + ], + "store_path": "/nix/store/b97bbxn6kpysysxb8nxn4k39ffxmp4p6-go-1.22.5" }, "x86_64-darwin": { - "store_path": "/nix/store/f64hpgi6lnn8vrf22cff2y8307c7zns3-go-1.22.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/gdyii59c48s4a8q6w584ccgm95qls3lh-go-1.22.5", + "default": true + } + ], + "store_path": "/nix/store/gdyii59c48s4a8q6w584ccgm95qls3lh-go-1.22.5" }, "x86_64-linux": { - "store_path": "/nix/store/jw9qrkqlkm699ncbrbs1d4czfg4wg8da-go-1.22.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/3v17dij8rvg7q99009swxg52995r7s22-go-1.22.5", + "default": true + } + ], + "store_path": "/nix/store/3v17dij8rvg7q99009swxg52995r7s22-go-1.22.5" } } }, - "golangci-lint@1.59.1": { + "golangci-lint@latest": { "last_modified": "2024-07-20T09:11:00Z", "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#golangci-lint", "source": "devbox-search", @@ -317,23 +473,57 @@ } } }, - "gotestsum@1.6.4": { - "last_modified": "2021-07-26T10:49:44Z", - "resolved": "github:NixOS/nixpkgs/2030abed5863fc11eccac0735f27a0828376c84e#gotestsum", + "gotestsum@latest": { + "last_modified": "2024-07-31T08:48:38Z", + "resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#gotestsum", "source": "devbox-search", - "version": "1.6.4", + "version": "1.11.0", "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/szsxbm94ddwvxcj7zxnq8mbp2y7cbcgx-gotestsum-1.11.0", + "default": true + } + ], + "store_path": "/nix/store/szsxbm94ddwvxcj7zxnq8mbp2y7cbcgx-gotestsum-1.11.0" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/1nf69d1w2rscdr6xgfxjkyxnvv3ikg9y-gotestsum-1.11.0", + "default": true + } + ], + "store_path": "/nix/store/1nf69d1w2rscdr6xgfxjkyxnvv3ikg9y-gotestsum-1.11.0" + }, "x86_64-darwin": { - "store_path": "/nix/store/h52cm9mal909jg80wiksi9qhyxlpzws4-gotestsum-1.6.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/ngdklr107j9fxsj1ysgpyj1d80bka61x-gotestsum-1.11.0", + "default": true + } + ], + "store_path": "/nix/store/ngdklr107j9fxsj1ysgpyj1d80bka61x-gotestsum-1.11.0" }, "x86_64-linux": { - "store_path": "/nix/store/y5din5xy7vxwmdhdhpf70mbgbarl3hps-gotestsum-1.6.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/i3s4zlzbwr4px5kaj16nkp96wcs0128j-gotestsum-1.11.0", + "default": true + } + ], + "store_path": "/nix/store/i3s4zlzbwr4px5kaj16nkp96wcs0128j-gotestsum-1.11.0" } } }, - "kind@0.23.0": { - "last_modified": "2024-07-07T07:43:47Z", - "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#kind", + "kind@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#kind", "source": "devbox-search", "version": "0.23.0", "systems": { @@ -361,11 +551,11 @@ "outputs": [ { "name": "out", - "path": "/nix/store/84yfg589787wmrvcb9i3vchv3l9yrd05-kind-0.23.0", + "path": "/nix/store/4ifhijdnd34mzl5laq19racpny4056a0-kind-0.23.0", "default": true } ], - "store_path": "/nix/store/84yfg589787wmrvcb9i3vchv3l9yrd05-kind-0.23.0" + "store_path": "/nix/store/4ifhijdnd34mzl5laq19racpny4056a0-kind-0.23.0" }, "x86_64-linux": { "outputs": [ @@ -379,23 +569,51 @@ } } }, - "ko@0.15.2": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#ko", + "ko@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#ko", "source": "devbox-search", - "version": "0.15.2", + "version": "0.15.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/w1956i0wk0js5xlzxdzj8wf6svqqh9vq-ko-0.15.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/55z0jl9gi5x88sdy4ml89dpz76ixhf2x-ko-0.15.4", + "default": true + } + ], + "store_path": "/nix/store/55z0jl9gi5x88sdy4ml89dpz76ixhf2x-ko-0.15.4" }, "aarch64-linux": { - "store_path": "/nix/store/aiqhkbfp8b7w8prph4njlnxb1p1ll83w-ko-0.15.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/amyq0brnkx8j3920zic62qaz5gnjlwlv-ko-0.15.4", + "default": true + } + ], + "store_path": "/nix/store/amyq0brnkx8j3920zic62qaz5gnjlwlv-ko-0.15.4" }, "x86_64-darwin": { - "store_path": "/nix/store/7y9hnyn6a6073883qvsw0wsdh84riajb-ko-0.15.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/n5a16q3llcz19rpyqb072z5spkcvlp94-ko-0.15.4", + "default": true + } + ], + "store_path": "/nix/store/n5a16q3llcz19rpyqb072z5spkcvlp94-ko-0.15.4" }, "x86_64-linux": { - "store_path": "/nix/store/jwsiwj876pc96xgahnpasbnk4fb226c3-ko-0.15.2" + "outputs": [ + { + "name": "out", + "path": "/nix/store/5klg0yk9h2agipzk9ahyic9vbhag8lvm-ko-0.15.4", + "default": true + } + ], + "store_path": "/nix/store/5klg0yk9h2agipzk9ahyic9vbhag8lvm-ko-0.15.4" } } }, @@ -483,43 +701,99 @@ } } }, - "kubernetes-code-generator@0.25.4": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#kubernetes-code-generator", + "kubernetes-code-generator@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#kubernetes-code-generator", "source": "devbox-search", "version": "0.25.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/4lgxc2xsmlgdh25hcy92r3qaaz4yhbs9-code-generator-0.25.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/s87p1wvldz6bv870bq5kzy0zg7j5zyyw-code-generator-0.25.4", + "default": true + } + ], + "store_path": "/nix/store/s87p1wvldz6bv870bq5kzy0zg7j5zyyw-code-generator-0.25.4" }, "aarch64-linux": { - "store_path": "/nix/store/c8z6smxy73rb9g8s1gs4c4fjdz44qqps-code-generator-0.25.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/0mcrl64qakbbab477dwh3c3pncvjbij9-code-generator-0.25.4", + "default": true + } + ], + "store_path": "/nix/store/0mcrl64qakbbab477dwh3c3pncvjbij9-code-generator-0.25.4" }, "x86_64-darwin": { - "store_path": "/nix/store/s56852yprk93akrncybqzixjgrbhjr8b-code-generator-0.25.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/gs5pdr5in7yqgs05pk4kjnk0q01s9km8-code-generator-0.25.4", + "default": true + } + ], + "store_path": "/nix/store/gs5pdr5in7yqgs05pk4kjnk0q01s9km8-code-generator-0.25.4" }, "x86_64-linux": { - "store_path": "/nix/store/kjvnqi4g7aibzjsy2c7h2xf6hh5f1kyn-code-generator-0.25.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/w7915798cc3djicwzi6bxa9gnhh702d3-code-generator-0.25.4", + "default": true + } + ], + "store_path": "/nix/store/w7915798cc3djicwzi6bxa9gnhh702d3-code-generator-0.25.4" } } }, - "kubernetes-controller-tools@0.13.0": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#kubernetes-controller-tools", + "kubernetes-controller-tools@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#kubernetes-controller-tools", "source": "devbox-search", - "version": "0.13.0", + "version": "0.14.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/4ziq9d177mqvxm1bczfvac3y2hc3c9s8-controller-tools-0.13.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/xkgsph0jy95q715yvmz7n2883aw1ilww-controller-tools-0.14.0", + "default": true + } + ], + "store_path": "/nix/store/xkgsph0jy95q715yvmz7n2883aw1ilww-controller-tools-0.14.0" }, "aarch64-linux": { - "store_path": "/nix/store/6np0xywcrplmz44ic6njywi038il0ka2-controller-tools-0.13.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/3w2jszxz149k22nq1plb7zmhilq6gjds-controller-tools-0.14.0", + "default": true + } + ], + "store_path": "/nix/store/3w2jszxz149k22nq1plb7zmhilq6gjds-controller-tools-0.14.0" }, "x86_64-darwin": { - "store_path": "/nix/store/2zmj05mi78d7x8y6lldlhmpcyk0bxd4z-controller-tools-0.13.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/gprpggcw72m45pyrnvqlsz0apxhl085h-controller-tools-0.14.0", + "default": true + } + ], + "store_path": "/nix/store/gprpggcw72m45pyrnvqlsz0apxhl085h-controller-tools-0.14.0" }, "x86_64-linux": { - "store_path": "/nix/store/wpx1w04rdi4q83l9bzm4vr20xk4qf6mk-controller-tools-0.13.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/gwf8qqnrdaf986g7pm29312nar1aks5k-controller-tools-0.14.0", + "default": true + } + ], + "store_path": "/nix/store/gwf8qqnrdaf986g7pm29312nar1aks5k-controller-tools-0.14.0" } } }, @@ -571,63 +845,163 @@ } } }, - "kustomize@5.3.0": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#kustomize", + "kustomize@latest": { + "last_modified": "2024-07-21T11:05:48Z", + "resolved": "github:NixOS/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46#kustomize", "source": "devbox-search", - "version": "5.3.0", + "version": "5.4.3", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/br6l7r8k5yg89r82mhn73pq6xk88jdkg-kustomize-5.3.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/9nc6q2v7wi0gwjw0wv3vwclacga02y99-kustomize-5.4.3", + "default": true + } + ], + "store_path": "/nix/store/9nc6q2v7wi0gwjw0wv3vwclacga02y99-kustomize-5.4.3" }, "aarch64-linux": { - "store_path": "/nix/store/0r73szkj7dfvanhb3ii1sz9xl4ccn2xp-kustomize-5.3.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/6ksbhfg0pi2a1j5mvz2cmgppklh4mdjw-kustomize-5.4.3", + "default": true + } + ], + "store_path": "/nix/store/6ksbhfg0pi2a1j5mvz2cmgppklh4mdjw-kustomize-5.4.3" }, "x86_64-darwin": { - "store_path": "/nix/store/jrvqy04lpvmmv6wfi69913bxal3a8b8r-kustomize-5.3.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/n5y8f6rjaidxsd4hqsx44kdsd9nqmmx6-kustomize-5.4.3", + "default": true + } + ], + "store_path": "/nix/store/n5y8f6rjaidxsd4hqsx44kdsd9nqmmx6-kustomize-5.4.3" }, "x86_64-linux": { - "store_path": "/nix/store/dqsr15h8hv2rhc57r4z62ysrbpp6dpi3-kustomize-5.3.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/lhzpalmniskqs15qdi9l887sc2a5v3sb-kustomize-5.4.3", + "default": true + } + ], + "store_path": "/nix/store/lhzpalmniskqs15qdi9l887sc2a5v3sb-kustomize-5.4.3" } } }, - "mockgen@1.6.0": { - "last_modified": "2023-12-13T22:54:10Z", - "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#mockgen", + "mockgen@latest": { + "last_modified": "2024-07-20T09:11:00Z", + "resolved": "github:NixOS/nixpkgs/6e14bbce7bea6c4efd7adfa88a40dac750d80100#mockgen", "source": "devbox-search", - "version": "1.6.0", + "version": "0.4.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/8jsr1j1h8g3k3j5rg8vv79aviffxrfny-mockgen-1.6.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/k2s5hjmbix6qixwbfgwl6dvpsdyp8pjg-mockgen-0.4.0", + "default": true + } + ], + "store_path": "/nix/store/k2s5hjmbix6qixwbfgwl6dvpsdyp8pjg-mockgen-0.4.0" }, "aarch64-linux": { - "store_path": "/nix/store/34rrlc5lz43mibljdd7ai0qyi7zcq4ic-mockgen-1.6.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/y4scifjvhv60ac004rpp0x7k6ckhkg46-mockgen-0.4.0", + "default": true + } + ], + "store_path": "/nix/store/y4scifjvhv60ac004rpp0x7k6ckhkg46-mockgen-0.4.0" }, "x86_64-darwin": { - "store_path": "/nix/store/cj1r5vllmiq7fh4izsmlacjrdkw2h4b5-mockgen-1.6.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/mj1la5vzsbhpqnp607waa9wypkjra5wd-mockgen-0.4.0", + "default": true + } + ], + "store_path": "/nix/store/mj1la5vzsbhpqnp607waa9wypkjra5wd-mockgen-0.4.0" }, "x86_64-linux": { - "store_path": "/nix/store/hs49h3p9ss5f5bqv6phgsx93s4cawif2-mockgen-1.6.0" + "outputs": [ + { + "name": "out", + "path": "/nix/store/jw5dv0yf0h9zpi8rc20dmkxg5b4w1xga-mockgen-0.4.0", + "default": true + } + ], + "store_path": "/nix/store/jw5dv0yf0h9zpi8rc20dmkxg5b4w1xga-mockgen-0.4.0" } } }, - "yamllint@1.35.1": { - "last_modified": "2024-02-24T23:06:34Z", - "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#yamllint", + "yamllint@latest": { + "last_modified": "2024-07-07T07:43:47Z", + "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#yamllint", "source": "devbox-search", "version": "1.35.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/mm0x8z35nbqzkzxjk8czf03ljb413a69-python3.11-yamllint-1.35.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/2q8hpb88sqjmr26fq5jx5w53y04cg3jp-python3.12-yamllint-1.35.1", + "default": true + }, + { + "name": "dist", + "path": "/nix/store/sj4l32ivgs2y1mvhib6wmsxp3lrykway-python3.12-yamllint-1.35.1-dist" + } + ], + "store_path": "/nix/store/2q8hpb88sqjmr26fq5jx5w53y04cg3jp-python3.12-yamllint-1.35.1" }, "aarch64-linux": { - "store_path": "/nix/store/bbmlcjya53wpj0y4gdfg1i0b9ylpl0gr-python3.11-yamllint-1.35.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/4sba4q501m6p1a2312z2rvmnavcr3bq5-python3.12-yamllint-1.35.1", + "default": true + }, + { + "name": "dist", + "path": "/nix/store/aw2qn4j1apkqzyk7bgr81n030xbjwybw-python3.12-yamllint-1.35.1-dist" + } + ], + "store_path": "/nix/store/4sba4q501m6p1a2312z2rvmnavcr3bq5-python3.12-yamllint-1.35.1" }, "x86_64-darwin": { - "store_path": "/nix/store/c19xxf6xcyj6y1wcaxjy8j9g9mlkqhs9-python3.11-yamllint-1.35.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/48snq08xb9cfb78lxx9wx2cbgvd2m4ki-python3.12-yamllint-1.35.1", + "default": true + }, + { + "name": "dist", + "path": "/nix/store/wmacgfhf4c87n7a7za4v1z9fhvavv807-python3.12-yamllint-1.35.1-dist" + } + ], + "store_path": "/nix/store/48snq08xb9cfb78lxx9wx2cbgvd2m4ki-python3.12-yamllint-1.35.1" }, "x86_64-linux": { - "store_path": "/nix/store/65iqy1y0sfa7zgq6yxvfdkbnc8wksvqq-python3.11-yamllint-1.35.1" + "outputs": [ + { + "name": "out", + "path": "/nix/store/97nrnqdp5wwmlldady91mira1jnpxvzj-python3.12-yamllint-1.35.1", + "default": true + }, + { + "name": "dist", + "path": "/nix/store/zq792ybfv6sz9ryaa00l10azm75kp1g8-python3.12-yamllint-1.35.1-dist" + } + ], + "store_path": "/nix/store/97nrnqdp5wwmlldady91mira1jnpxvzj-python3.12-yamllint-1.35.1" } } } diff --git a/go.mod b/go.mod index 3a19478e1e..1f36df2859 100644 --- a/go.mod +++ b/go.mod @@ -148,6 +148,7 @@ require ( go.opentelemetry.io/otel/trace v1.22.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect + go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect diff --git a/go.sum b/go.sum index d7d77a76c1..091622cf23 100644 --- a/go.sum +++ b/go.sum @@ -424,6 +424,8 @@ go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93V go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= 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/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= diff --git a/hack/flakes/flake.lock b/hack/flakes/flake.lock index 12cc24d262..122b5b09ed 100644 --- a/hack/flakes/flake.lock +++ b/hack/flakes/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701436327, - "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { diff --git a/hack/flakes/flake.nix b/hack/flakes/flake.nix index 1c6e8e4e79..a80cb7e947 100644 --- a/hack/flakes/flake.nix +++ b/hack/flakes/flake.nix @@ -36,57 +36,6 @@ vendorHash = "sha256-8rbRxtOiKmnf68kjsUCXaZf+MHI1n5aXa91Aneq9SKo="; }; - go-junit-report = buildGo121Module { - name = "go-junit-report"; - src = fetchFromGitHub { - owner = "jstemmer"; - repo = "go-junit-report"; - rev = "v2.1.0"; - sha256 = "sha256-s4XVjACmpd10C5k+P3vtcS/aWxI6UkSUPyxzLhD2vRI="; - }; - vendorHash = "sha256-+KmC7m6xdkWTT/8MkGaW9gqkzeZ6LWL0DXbt+12iTHY="; - ldflags = [ "-s" "-w" ]; - meta = with lib; { - description = "Convert go test output to junit xml"; - homepage = "https://github.com/jstemmer/go-junit-report"; - license = licenses.mit; - maintainers = with maintainers; [ cryptix ]; - }; - }; - - gocov = buildGo121Module { - name = "gocov"; - src = fetchFromGitHub { - owner = "axw"; - repo = "gocov"; - rev = "v1.0.0"; - sha256 = "14dsbabp1h31zzx7xlzg604spk3k3a0wpyq9xsrpqr8hz425h9xv"; - }; - vendorSha256 = "1hkfj18sshn8z0w1njgrwzchagxz1fmpq26a1wsf47xd64ydzwi1"; - meta = with lib; { - description = "Coverage testing tool for The Go Programming Language."; - longDescription = '' - Coverage testing tool for The Go Programming Language. - ''; - license = licenses.mit; - broken = false; - maintainers = with maintainers; [ mpoquet ]; - platforms = platforms.all; - homepage = "https://github.com/axw/gocov"; - }; - }; - - gocov-xml = buildGo121Module { - name = "gocov-xml"; - src = fetchFromGitHub { - owner = "AlekSi"; - repo = "gocov-xml"; - rev = "v1.1.0"; - sha256 = "936xrDmxciVr1KpfzzpsztU0XvQGG4fv4v4K2HHSN/A="; - }; - vendorSha256 = "80fPJXEVj7szTFxxxf5MhWE6Zbll7/SDcdisfZdrOlQ="; - }; - yamllint-checkstyle = buildGo121Module { pname = "yamllint-checkstyle"; name = "yamllint-checkstyle"; diff --git a/main_test.go b/main_test.go index 3cda70528f..d6e3596205 100644 --- a/main_test.go +++ b/main_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/mock/gomock" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd/api" diff --git a/mocks/ctlclient/cache_mock.go b/mocks/ctlclient/cache_mock.go index 9788fbdd3b..ceeb1c0ba6 100644 --- a/mocks/ctlclient/cache_mock.go +++ b/mocks/ctlclient/cache_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: sigs.k8s.io/controller-runtime/pkg/cache (interfaces: Cache) +// +// Generated by this command: +// +// mockgen -destination=mocks/ctlclient/cache_mock.go -package=mockctlclient sigs.k8s.io/controller-runtime/pkg/cache Cache +// // Package mockctlclient is a generated GoMock package. package mockctlclient @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" cache "sigs.k8s.io/controller-runtime/pkg/cache" @@ -41,7 +46,7 @@ func (m *MockCache) EXPECT() *MockCacheMockRecorder { // Get mocks base method. func (m *MockCache) Get(arg0 context.Context, arg1 types.NamespacedName, arg2 client.Object, arg3 ...client.GetOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} + varargs := []any{arg0, arg1, arg2} for _, a := range arg3 { varargs = append(varargs, a) } @@ -51,16 +56,16 @@ func (m *MockCache) Get(arg0 context.Context, arg1 types.NamespacedName, arg2 cl } // Get indicates an expected call of Get. -func (mr *MockCacheMockRecorder) Get(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Get(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{arg0, arg1, arg2}, arg3...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockCache)(nil).Get), varargs...) } // GetInformer mocks base method. func (m *MockCache) GetInformer(arg0 context.Context, arg1 client.Object, arg2 ...cache.InformerGetOption) (cache.Informer, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -71,16 +76,16 @@ func (m *MockCache) GetInformer(arg0 context.Context, arg1 client.Object, arg2 . } // GetInformer indicates an expected call of GetInformer. -func (mr *MockCacheMockRecorder) GetInformer(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) GetInformer(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInformer", reflect.TypeOf((*MockCache)(nil).GetInformer), varargs...) } // GetInformerForKind mocks base method. func (m *MockCache) GetInformerForKind(arg0 context.Context, arg1 schema.GroupVersionKind, arg2 ...cache.InformerGetOption) (cache.Informer, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -91,9 +96,9 @@ func (m *MockCache) GetInformerForKind(arg0 context.Context, arg1 schema.GroupVe } // GetInformerForKind indicates an expected call of GetInformerForKind. -func (mr *MockCacheMockRecorder) GetInformerForKind(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) GetInformerForKind(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInformerForKind", reflect.TypeOf((*MockCache)(nil).GetInformerForKind), varargs...) } @@ -106,7 +111,7 @@ func (m *MockCache) IndexField(arg0 context.Context, arg1 client.Object, arg2 st } // IndexField indicates an expected call of IndexField. -func (mr *MockCacheMockRecorder) IndexField(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) IndexField(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IndexField", reflect.TypeOf((*MockCache)(nil).IndexField), arg0, arg1, arg2, arg3) } @@ -114,7 +119,7 @@ func (mr *MockCacheMockRecorder) IndexField(arg0, arg1, arg2, arg3 interface{}) // List mocks base method. func (m *MockCache) List(arg0 context.Context, arg1 client.ObjectList, arg2 ...client.ListOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -124,9 +129,9 @@ func (m *MockCache) List(arg0 context.Context, arg1 client.ObjectList, arg2 ...c } // List indicates an expected call of List. -func (mr *MockCacheMockRecorder) List(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) List(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockCache)(nil).List), varargs...) } @@ -139,7 +144,7 @@ func (m *MockCache) RemoveInformer(arg0 context.Context, arg1 client.Object) err } // RemoveInformer indicates an expected call of RemoveInformer. -func (mr *MockCacheMockRecorder) RemoveInformer(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) RemoveInformer(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveInformer", reflect.TypeOf((*MockCache)(nil).RemoveInformer), arg0, arg1) } @@ -153,7 +158,7 @@ func (m *MockCache) Start(arg0 context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockCacheMockRecorder) Start(arg0 interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockCache)(nil).Start), arg0) } @@ -167,7 +172,7 @@ func (m *MockCache) WaitForCacheSync(arg0 context.Context) bool { } // WaitForCacheSync indicates an expected call of WaitForCacheSync. -func (mr *MockCacheMockRecorder) WaitForCacheSync(arg0 interface{}) *gomock.Call { +func (mr *MockCacheMockRecorder) WaitForCacheSync(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForCacheSync", reflect.TypeOf((*MockCache)(nil).WaitForCacheSync), arg0) } diff --git a/mocks/ctlclient/client_mock.go b/mocks/ctlclient/client_mock.go index 3feda1ef57..675ce98465 100644 --- a/mocks/ctlclient/client_mock.go +++ b/mocks/ctlclient/client_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: sigs.k8s.io/controller-runtime/pkg/client (interfaces: Client) +// +// Generated by this command: +// +// mockgen -destination=mocks/ctlclient/client_mock.go -package=mockctlclient sigs.k8s.io/controller-runtime/pkg/client Client +// // Package mockctlclient is a generated GoMock package. package mockctlclient @@ -8,7 +13,7 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" meta "k8s.io/apimachinery/pkg/api/meta" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -42,7 +47,7 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { // Create mocks base method. func (m *MockClient) Create(arg0 context.Context, arg1 client.Object, arg2 ...client.CreateOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -52,16 +57,16 @@ func (m *MockClient) Create(arg0 context.Context, arg1 client.Object, arg2 ...cl } // Create indicates an expected call of Create. -func (mr *MockClientMockRecorder) Create(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Create(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockClient)(nil).Create), varargs...) } // Delete mocks base method. func (m *MockClient) Delete(arg0 context.Context, arg1 client.Object, arg2 ...client.DeleteOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -71,16 +76,16 @@ func (m *MockClient) Delete(arg0 context.Context, arg1 client.Object, arg2 ...cl } // Delete indicates an expected call of Delete. -func (mr *MockClientMockRecorder) Delete(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Delete(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockClient)(nil).Delete), varargs...) } // DeleteAllOf mocks base method. func (m *MockClient) DeleteAllOf(arg0 context.Context, arg1 client.Object, arg2 ...client.DeleteAllOfOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -90,16 +95,16 @@ func (m *MockClient) DeleteAllOf(arg0 context.Context, arg1 client.Object, arg2 } // DeleteAllOf indicates an expected call of DeleteAllOf. -func (mr *MockClientMockRecorder) DeleteAllOf(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) DeleteAllOf(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAllOf", reflect.TypeOf((*MockClient)(nil).DeleteAllOf), varargs...) } // Get mocks base method. func (m *MockClient) Get(arg0 context.Context, arg1 types.NamespacedName, arg2 client.Object, arg3 ...client.GetOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} + varargs := []any{arg0, arg1, arg2} for _, a := range arg3 { varargs = append(varargs, a) } @@ -109,9 +114,9 @@ func (m *MockClient) Get(arg0 context.Context, arg1 types.NamespacedName, arg2 c } // Get indicates an expected call of Get. -func (mr *MockClientMockRecorder) Get(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Get(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{arg0, arg1, arg2}, arg3...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockClient)(nil).Get), varargs...) } @@ -125,7 +130,7 @@ func (m *MockClient) GroupVersionKindFor(arg0 runtime.Object) (schema.GroupVersi } // GroupVersionKindFor indicates an expected call of GroupVersionKindFor. -func (mr *MockClientMockRecorder) GroupVersionKindFor(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) GroupVersionKindFor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupVersionKindFor", reflect.TypeOf((*MockClient)(nil).GroupVersionKindFor), arg0) } @@ -140,7 +145,7 @@ func (m *MockClient) IsObjectNamespaced(arg0 runtime.Object) (bool, error) { } // IsObjectNamespaced indicates an expected call of IsObjectNamespaced. -func (mr *MockClientMockRecorder) IsObjectNamespaced(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) IsObjectNamespaced(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsObjectNamespaced", reflect.TypeOf((*MockClient)(nil).IsObjectNamespaced), arg0) } @@ -148,7 +153,7 @@ func (mr *MockClientMockRecorder) IsObjectNamespaced(arg0 interface{}) *gomock.C // List mocks base method. func (m *MockClient) List(arg0 context.Context, arg1 client.ObjectList, arg2 ...client.ListOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -158,16 +163,16 @@ func (m *MockClient) List(arg0 context.Context, arg1 client.ObjectList, arg2 ... } // List indicates an expected call of List. -func (mr *MockClientMockRecorder) List(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) List(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockClient)(nil).List), varargs...) } // Patch mocks base method. func (m *MockClient) Patch(arg0 context.Context, arg1 client.Object, arg2 client.Patch, arg3 ...client.PatchOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} + varargs := []any{arg0, arg1, arg2} for _, a := range arg3 { varargs = append(varargs, a) } @@ -177,9 +182,9 @@ func (m *MockClient) Patch(arg0 context.Context, arg1 client.Object, arg2 client } // Patch indicates an expected call of Patch. -func (mr *MockClientMockRecorder) Patch(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Patch(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{arg0, arg1, arg2}, arg3...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockClient)(nil).Patch), varargs...) } @@ -234,7 +239,7 @@ func (m *MockClient) SubResource(arg0 string) client.SubResourceClient { } // SubResource indicates an expected call of SubResource. -func (mr *MockClientMockRecorder) SubResource(arg0 interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) SubResource(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubResource", reflect.TypeOf((*MockClient)(nil).SubResource), arg0) } @@ -242,7 +247,7 @@ func (mr *MockClientMockRecorder) SubResource(arg0 interface{}) *gomock.Call { // Update mocks base method. func (m *MockClient) Update(arg0 context.Context, arg1 client.Object, arg2 ...client.UpdateOption) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} + varargs := []any{arg0, arg1} for _, a := range arg2 { varargs = append(varargs, a) } @@ -252,8 +257,8 @@ func (m *MockClient) Update(arg0 context.Context, arg1 client.Object, arg2 ...cl } // Update indicates an expected call of Update. -func (mr *MockClientMockRecorder) Update(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockClientMockRecorder) Update(arg0, arg1 any, arg2 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockClient)(nil).Update), varargs...) } diff --git a/mocks/ctlclient/manager_mock.go b/mocks/ctlclient/manager_mock.go index 04e7b13cdf..7261d058b8 100644 --- a/mocks/ctlclient/manager_mock.go +++ b/mocks/ctlclient/manager_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: sigs.k8s.io/controller-runtime/pkg/manager (interfaces: Manager) +// +// Generated by this command: +// +// mockgen -destination=mocks/ctlclient/manager_mock.go -package=mockctlclient sigs.k8s.io/controller-runtime/pkg/manager Manager +// // Package mockctlclient is a generated GoMock package. package mockctlclient @@ -10,7 +15,7 @@ import ( reflect "reflect" logr "github.com/go-logr/logr" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" meta "k8s.io/apimachinery/pkg/api/meta" runtime "k8s.io/apimachinery/pkg/runtime" rest "k8s.io/client-go/rest" @@ -55,7 +60,7 @@ func (m *MockManager) Add(arg0 manager.Runnable) error { } // Add indicates an expected call of Add. -func (mr *MockManagerMockRecorder) Add(arg0 interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Add(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockManager)(nil).Add), arg0) } @@ -69,7 +74,7 @@ func (m *MockManager) AddHealthzCheck(arg0 string, arg1 healthz.Checker) error { } // AddHealthzCheck indicates an expected call of AddHealthzCheck. -func (mr *MockManagerMockRecorder) AddHealthzCheck(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) AddHealthzCheck(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHealthzCheck", reflect.TypeOf((*MockManager)(nil).AddHealthzCheck), arg0, arg1) } @@ -83,7 +88,7 @@ func (m *MockManager) AddReadyzCheck(arg0 string, arg1 healthz.Checker) error { } // AddReadyzCheck indicates an expected call of AddReadyzCheck. -func (mr *MockManagerMockRecorder) AddReadyzCheck(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) AddReadyzCheck(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddReadyzCheck", reflect.TypeOf((*MockManager)(nil).AddReadyzCheck), arg0, arg1) } @@ -181,7 +186,7 @@ func (m *MockManager) GetEventRecorderFor(arg0 string) record.EventRecorder { } // GetEventRecorderFor indicates an expected call of GetEventRecorderFor. -func (mr *MockManagerMockRecorder) GetEventRecorderFor(arg0 interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) GetEventRecorderFor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEventRecorderFor", reflect.TypeOf((*MockManager)(nil).GetEventRecorderFor), arg0) } @@ -279,7 +284,7 @@ func (m *MockManager) Start(arg0 context.Context) error { } // Start indicates an expected call of Start. -func (mr *MockManagerMockRecorder) Start(arg0 interface{}) *gomock.Call { +func (mr *MockManagerMockRecorder) Start(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockManager)(nil).Start), arg0) } diff --git a/mocks/k8sapimachinery/interfaces.go b/mocks/k8sapimachinery/interfaces.go index 040c11d5ff..1a5b357d39 100644 --- a/mocks/k8sapimachinery/interfaces.go +++ b/mocks/k8sapimachinery/interfaces.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: k8s.io/apimachinery/pkg/api/meta (interfaces: RESTMapper,RESTScope) +// +// Generated by this command: +// +// mockgen -destination=mocks/k8sapimachinery/interfaces.go -package=mockmeta k8s.io/apimachinery/pkg/api/meta RESTMapper,RESTScope +// // Package mockmeta is a generated GoMock package. package mockmeta @@ -7,7 +12,7 @@ package mockmeta import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" meta "k8s.io/apimachinery/pkg/api/meta" schema "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -45,7 +50,7 @@ func (m *MockRESTMapper) KindFor(arg0 schema.GroupVersionResource) (schema.Group } // KindFor indicates an expected call of KindFor. -func (mr *MockRESTMapperMockRecorder) KindFor(arg0 interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) KindFor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KindFor", reflect.TypeOf((*MockRESTMapper)(nil).KindFor), arg0) } @@ -60,7 +65,7 @@ func (m *MockRESTMapper) KindsFor(arg0 schema.GroupVersionResource) ([]schema.Gr } // KindsFor indicates an expected call of KindsFor. -func (mr *MockRESTMapperMockRecorder) KindsFor(arg0 interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) KindsFor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KindsFor", reflect.TypeOf((*MockRESTMapper)(nil).KindsFor), arg0) } @@ -68,7 +73,7 @@ func (mr *MockRESTMapperMockRecorder) KindsFor(arg0 interface{}) *gomock.Call { // RESTMapping mocks base method. func (m *MockRESTMapper) RESTMapping(arg0 schema.GroupKind, arg1 ...string) (*meta.RESTMapping, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -79,16 +84,16 @@ func (m *MockRESTMapper) RESTMapping(arg0 schema.GroupKind, arg1 ...string) (*me } // RESTMapping indicates an expected call of RESTMapping. -func (mr *MockRESTMapperMockRecorder) RESTMapping(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) RESTMapping(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RESTMapping", reflect.TypeOf((*MockRESTMapper)(nil).RESTMapping), varargs...) } // RESTMappings mocks base method. func (m *MockRESTMapper) RESTMappings(arg0 schema.GroupKind, arg1 ...string) ([]*meta.RESTMapping, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0} + varargs := []any{arg0} for _, a := range arg1 { varargs = append(varargs, a) } @@ -99,9 +104,9 @@ func (m *MockRESTMapper) RESTMappings(arg0 schema.GroupKind, arg1 ...string) ([] } // RESTMappings indicates an expected call of RESTMappings. -func (mr *MockRESTMapperMockRecorder) RESTMappings(arg0 interface{}, arg1 ...interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) RESTMappings(arg0 any, arg1 ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0}, arg1...) + varargs := append([]any{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RESTMappings", reflect.TypeOf((*MockRESTMapper)(nil).RESTMappings), varargs...) } @@ -115,7 +120,7 @@ func (m *MockRESTMapper) ResourceFor(arg0 schema.GroupVersionResource) (schema.G } // ResourceFor indicates an expected call of ResourceFor. -func (mr *MockRESTMapperMockRecorder) ResourceFor(arg0 interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) ResourceFor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResourceFor", reflect.TypeOf((*MockRESTMapper)(nil).ResourceFor), arg0) } @@ -130,7 +135,7 @@ func (m *MockRESTMapper) ResourceSingularizer(arg0 string) (string, error) { } // ResourceSingularizer indicates an expected call of ResourceSingularizer. -func (mr *MockRESTMapperMockRecorder) ResourceSingularizer(arg0 interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) ResourceSingularizer(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResourceSingularizer", reflect.TypeOf((*MockRESTMapper)(nil).ResourceSingularizer), arg0) } @@ -145,7 +150,7 @@ func (m *MockRESTMapper) ResourcesFor(arg0 schema.GroupVersionResource) ([]schem } // ResourcesFor indicates an expected call of ResourcesFor. -func (mr *MockRESTMapperMockRecorder) ResourcesFor(arg0 interface{}) *gomock.Call { +func (mr *MockRESTMapperMockRecorder) ResourcesFor(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResourcesFor", reflect.TypeOf((*MockRESTMapper)(nil).ResourcesFor), arg0) } diff --git a/mocks/k8sclient/informer.go b/mocks/k8sclient/informer.go index 3b1785d4d7..f3ba48521e 100644 --- a/mocks/k8sclient/informer.go +++ b/mocks/k8sclient/informer.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: k8s.io/client-go/informers/core/v1 (interfaces: ConfigMapInformer,SecretInformer) +// +// Generated by this command: +// +// mockgen -destination=mocks/k8sclient/informer.go -package=mockk8sclient k8s.io/client-go/informers/core/v1 ConfigMapInformer,SecretInformer +// // Package mockk8sclient is a generated GoMock package. package mockk8sclient @@ -7,7 +12,7 @@ package mockk8sclient import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" v1 "k8s.io/client-go/listers/core/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/mocks/k8sclient/lister.go b/mocks/k8sclient/lister.go index 4c5e6ddaeb..721ddff119 100644 --- a/mocks/k8sclient/lister.go +++ b/mocks/k8sclient/lister.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: k8s.io/client-go/listers/core/v1 (interfaces: SecretLister,SecretNamespaceLister) +// +// Generated by this command: +// +// mockgen -destination=mocks/k8sclient/lister.go -package=mockk8sclient k8s.io/client-go/listers/core/v1 SecretLister,SecretNamespaceLister +// // Package mockk8sclient is a generated GoMock package. package mockk8sclient @@ -7,7 +12,7 @@ package mockk8sclient import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" v1 "k8s.io/api/core/v1" labels "k8s.io/apimachinery/pkg/labels" v10 "k8s.io/client-go/listers/core/v1" @@ -46,7 +51,7 @@ func (m *MockSecretLister) List(arg0 labels.Selector) ([]*v1.Secret, error) { } // List indicates an expected call of List. -func (mr *MockSecretListerMockRecorder) List(arg0 interface{}) *gomock.Call { +func (mr *MockSecretListerMockRecorder) List(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockSecretLister)(nil).List), arg0) } @@ -60,7 +65,7 @@ func (m *MockSecretLister) Secrets(arg0 string) v10.SecretNamespaceLister { } // Secrets indicates an expected call of Secrets. -func (mr *MockSecretListerMockRecorder) Secrets(arg0 interface{}) *gomock.Call { +func (mr *MockSecretListerMockRecorder) Secrets(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Secrets", reflect.TypeOf((*MockSecretLister)(nil).Secrets), arg0) } @@ -98,7 +103,7 @@ func (m *MockSecretNamespaceLister) Get(arg0 string) (*v1.Secret, error) { } // Get indicates an expected call of Get. -func (mr *MockSecretNamespaceListerMockRecorder) Get(arg0 interface{}) *gomock.Call { +func (mr *MockSecretNamespaceListerMockRecorder) Get(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockSecretNamespaceLister)(nil).Get), arg0) } @@ -113,7 +118,7 @@ func (m *MockSecretNamespaceLister) List(arg0 labels.Selector) ([]*v1.Secret, er } // List indicates an expected call of List. -func (mr *MockSecretNamespaceListerMockRecorder) List(arg0 interface{}) *gomock.Call { +func (mr *MockSecretNamespaceListerMockRecorder) List(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockSecretNamespaceLister)(nil).List), arg0) } diff --git a/mocks/nutanix/v3.go b/mocks/nutanix/v3.go index ecc198b058..90ed3e521e 100644 --- a/mocks/nutanix/v3.go +++ b/mocks/nutanix/v3.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/nutanix-cloud-native/prism-go-client/v3 (interfaces: Service) +// +// Generated by this command: +// +// mockgen -destination=mocks/nutanix/v3.go -package=mocknutanixv3 github.com/nutanix-cloud-native/prism-go-client/v3 Service +// // Package mocknutanixv3 is a generated GoMock package. package mocknutanixv3 @@ -8,10 +13,10 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" prismgoclient "github.com/nutanix-cloud-native/prism-go-client" v3 "github.com/nutanix-cloud-native/prism-go-client/v3" models "github.com/nutanix-cloud-native/prism-go-client/v3/models" + gomock "go.uber.org/mock/gomock" ) // MockService is a mock of Service interface. @@ -47,7 +52,7 @@ func (m *MockService) CreateAccessControlPolicy(arg0 context.Context, arg1 *v3.A } // CreateAccessControlPolicy indicates an expected call of CreateAccessControlPolicy. -func (mr *MockServiceMockRecorder) CreateAccessControlPolicy(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateAccessControlPolicy(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessControlPolicy", reflect.TypeOf((*MockService)(nil).CreateAccessControlPolicy), arg0, arg1) } @@ -62,7 +67,7 @@ func (m *MockService) CreateAddressGroup(arg0 context.Context, arg1 *v3.AddressG } // CreateAddressGroup indicates an expected call of CreateAddressGroup. -func (mr *MockServiceMockRecorder) CreateAddressGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateAddressGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAddressGroup", reflect.TypeOf((*MockService)(nil).CreateAddressGroup), arg0, arg1) } @@ -77,7 +82,7 @@ func (m *MockService) CreateImage(arg0 context.Context, arg1 *v3.ImageIntentInpu } // CreateImage indicates an expected call of CreateImage. -func (mr *MockServiceMockRecorder) CreateImage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateImage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateImage", reflect.TypeOf((*MockService)(nil).CreateImage), arg0, arg1) } @@ -92,7 +97,7 @@ func (m *MockService) CreateNetworkSecurityRule(arg0 context.Context, arg1 *v3.N } // CreateNetworkSecurityRule indicates an expected call of CreateNetworkSecurityRule. -func (mr *MockServiceMockRecorder) CreateNetworkSecurityRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateNetworkSecurityRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateNetworkSecurityRule", reflect.TypeOf((*MockService)(nil).CreateNetworkSecurityRule), arg0, arg1) } @@ -107,7 +112,7 @@ func (m *MockService) CreateOrUpdateCategoryKey(arg0 context.Context, arg1 *v3.C } // CreateOrUpdateCategoryKey indicates an expected call of CreateOrUpdateCategoryKey. -func (mr *MockServiceMockRecorder) CreateOrUpdateCategoryKey(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateOrUpdateCategoryKey(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrUpdateCategoryKey", reflect.TypeOf((*MockService)(nil).CreateOrUpdateCategoryKey), arg0, arg1) } @@ -122,7 +127,7 @@ func (m *MockService) CreateOrUpdateCategoryValue(arg0 context.Context, arg1 str } // CreateOrUpdateCategoryValue indicates an expected call of CreateOrUpdateCategoryValue. -func (mr *MockServiceMockRecorder) CreateOrUpdateCategoryValue(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateOrUpdateCategoryValue(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrUpdateCategoryValue", reflect.TypeOf((*MockService)(nil).CreateOrUpdateCategoryValue), arg0, arg1, arg2) } @@ -137,7 +142,7 @@ func (m *MockService) CreateProject(arg0 context.Context, arg1 *v3.Project) (*v3 } // CreateProject indicates an expected call of CreateProject. -func (mr *MockServiceMockRecorder) CreateProject(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateProject(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateProject", reflect.TypeOf((*MockService)(nil).CreateProject), arg0, arg1) } @@ -152,7 +157,7 @@ func (m *MockService) CreateProtectionRule(arg0 context.Context, arg1 *v3.Protec } // CreateProtectionRule indicates an expected call of CreateProtectionRule. -func (mr *MockServiceMockRecorder) CreateProtectionRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateProtectionRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateProtectionRule", reflect.TypeOf((*MockService)(nil).CreateProtectionRule), arg0, arg1) } @@ -167,7 +172,7 @@ func (m *MockService) CreateRecoveryPlan(arg0 context.Context, arg1 *v3.Recovery } // CreateRecoveryPlan indicates an expected call of CreateRecoveryPlan. -func (mr *MockServiceMockRecorder) CreateRecoveryPlan(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateRecoveryPlan(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRecoveryPlan", reflect.TypeOf((*MockService)(nil).CreateRecoveryPlan), arg0, arg1) } @@ -182,7 +187,7 @@ func (m *MockService) CreateRecoveryPlanJob(arg0 context.Context, arg1 *v3.Recov } // CreateRecoveryPlanJob indicates an expected call of CreateRecoveryPlanJob. -func (mr *MockServiceMockRecorder) CreateRecoveryPlanJob(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateRecoveryPlanJob(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRecoveryPlanJob", reflect.TypeOf((*MockService)(nil).CreateRecoveryPlanJob), arg0, arg1) } @@ -197,7 +202,7 @@ func (m *MockService) CreateRole(arg0 context.Context, arg1 *v3.Role) (*v3.Role, } // CreateRole indicates an expected call of CreateRole. -func (mr *MockServiceMockRecorder) CreateRole(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateRole(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRole", reflect.TypeOf((*MockService)(nil).CreateRole), arg0, arg1) } @@ -212,7 +217,7 @@ func (m *MockService) CreateServiceGroup(arg0 context.Context, arg1 *v3.ServiceG } // CreateServiceGroup indicates an expected call of CreateServiceGroup. -func (mr *MockServiceMockRecorder) CreateServiceGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateServiceGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateServiceGroup", reflect.TypeOf((*MockService)(nil).CreateServiceGroup), arg0, arg1) } @@ -227,7 +232,7 @@ func (m *MockService) CreateSubnet(arg0 context.Context, arg1 *v3.SubnetIntentIn } // CreateSubnet indicates an expected call of CreateSubnet. -func (mr *MockServiceMockRecorder) CreateSubnet(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateSubnet(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSubnet", reflect.TypeOf((*MockService)(nil).CreateSubnet), arg0, arg1) } @@ -242,7 +247,7 @@ func (m *MockService) CreateUser(arg0 context.Context, arg1 *v3.UserIntentInput) } // CreateUser indicates an expected call of CreateUser. -func (mr *MockServiceMockRecorder) CreateUser(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateUser(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUser", reflect.TypeOf((*MockService)(nil).CreateUser), arg0, arg1) } @@ -257,7 +262,7 @@ func (m *MockService) CreateVM(arg0 context.Context, arg1 *v3.VMIntentInput) (*v } // CreateVM indicates an expected call of CreateVM. -func (mr *MockServiceMockRecorder) CreateVM(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateVM(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVM", reflect.TypeOf((*MockService)(nil).CreateVM), arg0, arg1) } @@ -272,7 +277,7 @@ func (m *MockService) CreateVolumeGroup(arg0 context.Context, arg1 *v3.VolumeGro } // CreateVolumeGroup indicates an expected call of CreateVolumeGroup. -func (mr *MockServiceMockRecorder) CreateVolumeGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) CreateVolumeGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVolumeGroup", reflect.TypeOf((*MockService)(nil).CreateVolumeGroup), arg0, arg1) } @@ -287,7 +292,7 @@ func (m *MockService) DeleteAccessControlPolicy(arg0 context.Context, arg1 strin } // DeleteAccessControlPolicy indicates an expected call of DeleteAccessControlPolicy. -func (mr *MockServiceMockRecorder) DeleteAccessControlPolicy(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteAccessControlPolicy(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessControlPolicy", reflect.TypeOf((*MockService)(nil).DeleteAccessControlPolicy), arg0, arg1) } @@ -301,7 +306,7 @@ func (m *MockService) DeleteAddressGroup(arg0 context.Context, arg1 string) erro } // DeleteAddressGroup indicates an expected call of DeleteAddressGroup. -func (mr *MockServiceMockRecorder) DeleteAddressGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteAddressGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAddressGroup", reflect.TypeOf((*MockService)(nil).DeleteAddressGroup), arg0, arg1) } @@ -315,7 +320,7 @@ func (m *MockService) DeleteCategoryKey(arg0 context.Context, arg1 string) error } // DeleteCategoryKey indicates an expected call of DeleteCategoryKey. -func (mr *MockServiceMockRecorder) DeleteCategoryKey(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteCategoryKey(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCategoryKey", reflect.TypeOf((*MockService)(nil).DeleteCategoryKey), arg0, arg1) } @@ -329,7 +334,7 @@ func (m *MockService) DeleteCategoryValue(arg0 context.Context, arg1, arg2 strin } // DeleteCategoryValue indicates an expected call of DeleteCategoryValue. -func (mr *MockServiceMockRecorder) DeleteCategoryValue(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteCategoryValue(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCategoryValue", reflect.TypeOf((*MockService)(nil).DeleteCategoryValue), arg0, arg1, arg2) } @@ -344,7 +349,7 @@ func (m *MockService) DeleteImage(arg0 context.Context, arg1 string) (*v3.Delete } // DeleteImage indicates an expected call of DeleteImage. -func (mr *MockServiceMockRecorder) DeleteImage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteImage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteImage", reflect.TypeOf((*MockService)(nil).DeleteImage), arg0, arg1) } @@ -359,7 +364,7 @@ func (m *MockService) DeleteNetworkSecurityRule(arg0 context.Context, arg1 strin } // DeleteNetworkSecurityRule indicates an expected call of DeleteNetworkSecurityRule. -func (mr *MockServiceMockRecorder) DeleteNetworkSecurityRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteNetworkSecurityRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteNetworkSecurityRule", reflect.TypeOf((*MockService)(nil).DeleteNetworkSecurityRule), arg0, arg1) } @@ -374,7 +379,7 @@ func (m *MockService) DeleteProject(arg0 context.Context, arg1 string) (*v3.Dele } // DeleteProject indicates an expected call of DeleteProject. -func (mr *MockServiceMockRecorder) DeleteProject(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteProject(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteProject", reflect.TypeOf((*MockService)(nil).DeleteProject), arg0, arg1) } @@ -389,7 +394,7 @@ func (m *MockService) DeleteProtectionRule(arg0 context.Context, arg1 string) (* } // DeleteProtectionRule indicates an expected call of DeleteProtectionRule. -func (mr *MockServiceMockRecorder) DeleteProtectionRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteProtectionRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteProtectionRule", reflect.TypeOf((*MockService)(nil).DeleteProtectionRule), arg0, arg1) } @@ -404,7 +409,7 @@ func (m *MockService) DeleteRecoveryPlan(arg0 context.Context, arg1 string) (*v3 } // DeleteRecoveryPlan indicates an expected call of DeleteRecoveryPlan. -func (mr *MockServiceMockRecorder) DeleteRecoveryPlan(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteRecoveryPlan(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRecoveryPlan", reflect.TypeOf((*MockService)(nil).DeleteRecoveryPlan), arg0, arg1) } @@ -418,7 +423,7 @@ func (m *MockService) DeleteRecoveryPlanJob(arg0 context.Context, arg1 string) e } // DeleteRecoveryPlanJob indicates an expected call of DeleteRecoveryPlanJob. -func (mr *MockServiceMockRecorder) DeleteRecoveryPlanJob(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteRecoveryPlanJob(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRecoveryPlanJob", reflect.TypeOf((*MockService)(nil).DeleteRecoveryPlanJob), arg0, arg1) } @@ -433,7 +438,7 @@ func (m *MockService) DeleteRole(arg0 context.Context, arg1 string) (*v3.DeleteR } // DeleteRole indicates an expected call of DeleteRole. -func (mr *MockServiceMockRecorder) DeleteRole(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteRole(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRole", reflect.TypeOf((*MockService)(nil).DeleteRole), arg0, arg1) } @@ -447,7 +452,7 @@ func (m *MockService) DeleteServiceGroup(arg0 context.Context, arg1 string) erro } // DeleteServiceGroup indicates an expected call of DeleteServiceGroup. -func (mr *MockServiceMockRecorder) DeleteServiceGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteServiceGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteServiceGroup", reflect.TypeOf((*MockService)(nil).DeleteServiceGroup), arg0, arg1) } @@ -462,7 +467,7 @@ func (m *MockService) DeleteSubnet(arg0 context.Context, arg1 string) (*v3.Delet } // DeleteSubnet indicates an expected call of DeleteSubnet. -func (mr *MockServiceMockRecorder) DeleteSubnet(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteSubnet(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSubnet", reflect.TypeOf((*MockService)(nil).DeleteSubnet), arg0, arg1) } @@ -477,7 +482,7 @@ func (m *MockService) DeleteUser(arg0 context.Context, arg1 string) (*v3.DeleteR } // DeleteUser indicates an expected call of DeleteUser. -func (mr *MockServiceMockRecorder) DeleteUser(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteUser(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUser", reflect.TypeOf((*MockService)(nil).DeleteUser), arg0, arg1) } @@ -492,7 +497,7 @@ func (m *MockService) DeleteVM(arg0 context.Context, arg1 string) (*v3.DeleteRes } // DeleteVM indicates an expected call of DeleteVM. -func (mr *MockServiceMockRecorder) DeleteVM(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteVM(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteVM", reflect.TypeOf((*MockService)(nil).DeleteVM), arg0, arg1) } @@ -506,7 +511,7 @@ func (m *MockService) DeleteVolumeGroup(arg0 context.Context, arg1 string) error } // DeleteVolumeGroup indicates an expected call of DeleteVolumeGroup. -func (mr *MockServiceMockRecorder) DeleteVolumeGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) DeleteVolumeGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteVolumeGroup", reflect.TypeOf((*MockService)(nil).DeleteVolumeGroup), arg0, arg1) } @@ -521,7 +526,7 @@ func (m *MockService) GetAccessControlPolicy(arg0 context.Context, arg1 string) } // GetAccessControlPolicy indicates an expected call of GetAccessControlPolicy. -func (mr *MockServiceMockRecorder) GetAccessControlPolicy(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetAccessControlPolicy(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessControlPolicy", reflect.TypeOf((*MockService)(nil).GetAccessControlPolicy), arg0, arg1) } @@ -536,7 +541,7 @@ func (m *MockService) GetAddressGroup(arg0 context.Context, arg1 string) (*v3.Ad } // GetAddressGroup indicates an expected call of GetAddressGroup. -func (mr *MockServiceMockRecorder) GetAddressGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetAddressGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressGroup", reflect.TypeOf((*MockService)(nil).GetAddressGroup), arg0, arg1) } @@ -551,7 +556,7 @@ func (m *MockService) GetAvailabilityZone(arg0 context.Context, arg1 string) (*v } // GetAvailabilityZone indicates an expected call of GetAvailabilityZone. -func (mr *MockServiceMockRecorder) GetAvailabilityZone(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetAvailabilityZone(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAvailabilityZone", reflect.TypeOf((*MockService)(nil).GetAvailabilityZone), arg0, arg1) } @@ -566,7 +571,7 @@ func (m *MockService) GetCategoryKey(arg0 context.Context, arg1 string) (*v3.Cat } // GetCategoryKey indicates an expected call of GetCategoryKey. -func (mr *MockServiceMockRecorder) GetCategoryKey(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetCategoryKey(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCategoryKey", reflect.TypeOf((*MockService)(nil).GetCategoryKey), arg0, arg1) } @@ -581,7 +586,7 @@ func (m *MockService) GetCategoryQuery(arg0 context.Context, arg1 *v3.CategoryQu } // GetCategoryQuery indicates an expected call of GetCategoryQuery. -func (mr *MockServiceMockRecorder) GetCategoryQuery(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetCategoryQuery(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCategoryQuery", reflect.TypeOf((*MockService)(nil).GetCategoryQuery), arg0, arg1) } @@ -596,7 +601,7 @@ func (m *MockService) GetCategoryValue(arg0 context.Context, arg1, arg2 string) } // GetCategoryValue indicates an expected call of GetCategoryValue. -func (mr *MockServiceMockRecorder) GetCategoryValue(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetCategoryValue(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCategoryValue", reflect.TypeOf((*MockService)(nil).GetCategoryValue), arg0, arg1, arg2) } @@ -611,7 +616,7 @@ func (m *MockService) GetCluster(arg0 context.Context, arg1 string) (*v3.Cluster } // GetCluster indicates an expected call of GetCluster. -func (mr *MockServiceMockRecorder) GetCluster(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetCluster(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCluster", reflect.TypeOf((*MockService)(nil).GetCluster), arg0, arg1) } @@ -626,7 +631,7 @@ func (m *MockService) GetCurrentLoggedInUser(arg0 context.Context) (*v3.UserInte } // GetCurrentLoggedInUser indicates an expected call of GetCurrentLoggedInUser. -func (mr *MockServiceMockRecorder) GetCurrentLoggedInUser(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetCurrentLoggedInUser(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentLoggedInUser", reflect.TypeOf((*MockService)(nil).GetCurrentLoggedInUser), arg0) } @@ -641,7 +646,7 @@ func (m *MockService) GetHost(arg0 context.Context, arg1 string) (*v3.HostRespon } // GetHost indicates an expected call of GetHost. -func (mr *MockServiceMockRecorder) GetHost(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetHost(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetHost", reflect.TypeOf((*MockService)(nil).GetHost), arg0, arg1) } @@ -656,7 +661,7 @@ func (m *MockService) GetImage(arg0 context.Context, arg1 string) (*v3.ImageInte } // GetImage indicates an expected call of GetImage. -func (mr *MockServiceMockRecorder) GetImage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetImage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImage", reflect.TypeOf((*MockService)(nil).GetImage), arg0, arg1) } @@ -671,7 +676,7 @@ func (m *MockService) GetNetworkSecurityRule(arg0 context.Context, arg1 string) } // GetNetworkSecurityRule indicates an expected call of GetNetworkSecurityRule. -func (mr *MockServiceMockRecorder) GetNetworkSecurityRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetNetworkSecurityRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNetworkSecurityRule", reflect.TypeOf((*MockService)(nil).GetNetworkSecurityRule), arg0, arg1) } @@ -686,7 +691,7 @@ func (m *MockService) GetPermission(arg0 context.Context, arg1 string) (*v3.Perm } // GetPermission indicates an expected call of GetPermission. -func (mr *MockServiceMockRecorder) GetPermission(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetPermission(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPermission", reflect.TypeOf((*MockService)(nil).GetPermission), arg0, arg1) } @@ -701,7 +706,7 @@ func (m *MockService) GetPrismCentral(arg0 context.Context) (*models.PrismCentra } // GetPrismCentral indicates an expected call of GetPrismCentral. -func (mr *MockServiceMockRecorder) GetPrismCentral(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetPrismCentral(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPrismCentral", reflect.TypeOf((*MockService)(nil).GetPrismCentral), arg0) } @@ -716,7 +721,7 @@ func (m *MockService) GetProject(arg0 context.Context, arg1 string) (*v3.Project } // GetProject indicates an expected call of GetProject. -func (mr *MockServiceMockRecorder) GetProject(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetProject(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProject", reflect.TypeOf((*MockService)(nil).GetProject), arg0, arg1) } @@ -731,7 +736,7 @@ func (m *MockService) GetProtectionRule(arg0 context.Context, arg1 string) (*v3. } // GetProtectionRule indicates an expected call of GetProtectionRule. -func (mr *MockServiceMockRecorder) GetProtectionRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetProtectionRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetProtectionRule", reflect.TypeOf((*MockService)(nil).GetProtectionRule), arg0, arg1) } @@ -746,7 +751,7 @@ func (m *MockService) GetRecoveryPlan(arg0 context.Context, arg1 string) (*v3.Re } // GetRecoveryPlan indicates an expected call of GetRecoveryPlan. -func (mr *MockServiceMockRecorder) GetRecoveryPlan(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetRecoveryPlan(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRecoveryPlan", reflect.TypeOf((*MockService)(nil).GetRecoveryPlan), arg0, arg1) } @@ -761,7 +766,7 @@ func (m *MockService) GetRecoveryPlanJob(arg0 context.Context, arg1 string) (*v3 } // GetRecoveryPlanJob indicates an expected call of GetRecoveryPlanJob. -func (mr *MockServiceMockRecorder) GetRecoveryPlanJob(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetRecoveryPlanJob(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRecoveryPlanJob", reflect.TypeOf((*MockService)(nil).GetRecoveryPlanJob), arg0, arg1) } @@ -776,7 +781,7 @@ func (m *MockService) GetRecoveryPlanJobStatus(arg0 context.Context, arg1, arg2 } // GetRecoveryPlanJobStatus indicates an expected call of GetRecoveryPlanJobStatus. -func (mr *MockServiceMockRecorder) GetRecoveryPlanJobStatus(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetRecoveryPlanJobStatus(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRecoveryPlanJobStatus", reflect.TypeOf((*MockService)(nil).GetRecoveryPlanJobStatus), arg0, arg1, arg2) } @@ -791,7 +796,7 @@ func (m *MockService) GetRole(arg0 context.Context, arg1 string) (*v3.Role, erro } // GetRole indicates an expected call of GetRole. -func (mr *MockServiceMockRecorder) GetRole(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetRole(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRole", reflect.TypeOf((*MockService)(nil).GetRole), arg0, arg1) } @@ -806,7 +811,7 @@ func (m *MockService) GetServiceGroup(arg0 context.Context, arg1 string) (*v3.Se } // GetServiceGroup indicates an expected call of GetServiceGroup. -func (mr *MockServiceMockRecorder) GetServiceGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetServiceGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetServiceGroup", reflect.TypeOf((*MockService)(nil).GetServiceGroup), arg0, arg1) } @@ -821,7 +826,7 @@ func (m *MockService) GetSubnet(arg0 context.Context, arg1 string) (*v3.SubnetIn } // GetSubnet indicates an expected call of GetSubnet. -func (mr *MockServiceMockRecorder) GetSubnet(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetSubnet(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSubnet", reflect.TypeOf((*MockService)(nil).GetSubnet), arg0, arg1) } @@ -836,7 +841,7 @@ func (m *MockService) GetTask(arg0 context.Context, arg1 string) (*v3.TasksRespo } // GetTask indicates an expected call of GetTask. -func (mr *MockServiceMockRecorder) GetTask(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetTask(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTask", reflect.TypeOf((*MockService)(nil).GetTask), arg0, arg1) } @@ -851,7 +856,7 @@ func (m *MockService) GetUser(arg0 context.Context, arg1 string) (*v3.UserIntent } // GetUser indicates an expected call of GetUser. -func (mr *MockServiceMockRecorder) GetUser(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetUser(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockService)(nil).GetUser), arg0, arg1) } @@ -866,7 +871,7 @@ func (m *MockService) GetUserGroup(arg0 context.Context, arg1 string) (*v3.UserG } // GetUserGroup indicates an expected call of GetUserGroup. -func (mr *MockServiceMockRecorder) GetUserGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetUserGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserGroup", reflect.TypeOf((*MockService)(nil).GetUserGroup), arg0, arg1) } @@ -881,7 +886,7 @@ func (m *MockService) GetVM(arg0 context.Context, arg1 string) (*v3.VMIntentResp } // GetVM indicates an expected call of GetVM. -func (mr *MockServiceMockRecorder) GetVM(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetVM(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVM", reflect.TypeOf((*MockService)(nil).GetVM), arg0, arg1) } @@ -896,7 +901,7 @@ func (m *MockService) GetVolumeGroup(arg0 context.Context, arg1 string) (*v3.Vol } // GetVolumeGroup indicates an expected call of GetVolumeGroup. -func (mr *MockServiceMockRecorder) GetVolumeGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GetVolumeGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVolumeGroup", reflect.TypeOf((*MockService)(nil).GetVolumeGroup), arg0, arg1) } @@ -911,7 +916,7 @@ func (m *MockService) GroupsGetEntities(arg0 context.Context, arg1 *v3.GroupsGet } // GroupsGetEntities indicates an expected call of GroupsGetEntities. -func (mr *MockServiceMockRecorder) GroupsGetEntities(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) GroupsGetEntities(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GroupsGetEntities", reflect.TypeOf((*MockService)(nil).GroupsGetEntities), arg0, arg1) } @@ -926,7 +931,7 @@ func (m *MockService) ListAccessControlPolicy(arg0 context.Context, arg1 *v3.DSM } // ListAccessControlPolicy indicates an expected call of ListAccessControlPolicy. -func (mr *MockServiceMockRecorder) ListAccessControlPolicy(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAccessControlPolicy(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAccessControlPolicy", reflect.TypeOf((*MockService)(nil).ListAccessControlPolicy), arg0, arg1) } @@ -941,7 +946,7 @@ func (m *MockService) ListAddressGroups(arg0 context.Context, arg1 *v3.DSMetadat } // ListAddressGroups indicates an expected call of ListAddressGroups. -func (mr *MockServiceMockRecorder) ListAddressGroups(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAddressGroups(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAddressGroups", reflect.TypeOf((*MockService)(nil).ListAddressGroups), arg0, arg1) } @@ -956,7 +961,7 @@ func (m *MockService) ListAllAccessControlPolicy(arg0 context.Context, arg1 stri } // ListAllAccessControlPolicy indicates an expected call of ListAllAccessControlPolicy. -func (mr *MockServiceMockRecorder) ListAllAccessControlPolicy(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllAccessControlPolicy(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllAccessControlPolicy", reflect.TypeOf((*MockService)(nil).ListAllAccessControlPolicy), arg0, arg1) } @@ -971,7 +976,7 @@ func (m *MockService) ListAllAddressGroups(arg0 context.Context, arg1 string) (* } // ListAllAddressGroups indicates an expected call of ListAllAddressGroups. -func (mr *MockServiceMockRecorder) ListAllAddressGroups(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllAddressGroups(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllAddressGroups", reflect.TypeOf((*MockService)(nil).ListAllAddressGroups), arg0, arg1) } @@ -986,7 +991,7 @@ func (m *MockService) ListAllCategoryValues(arg0 context.Context, arg1, arg2 str } // ListAllCategoryValues indicates an expected call of ListAllCategoryValues. -func (mr *MockServiceMockRecorder) ListAllCategoryValues(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllCategoryValues(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllCategoryValues", reflect.TypeOf((*MockService)(nil).ListAllCategoryValues), arg0, arg1, arg2) } @@ -1001,7 +1006,7 @@ func (m *MockService) ListAllCluster(arg0 context.Context, arg1 string) (*v3.Clu } // ListAllCluster indicates an expected call of ListAllCluster. -func (mr *MockServiceMockRecorder) ListAllCluster(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllCluster(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllCluster", reflect.TypeOf((*MockService)(nil).ListAllCluster), arg0, arg1) } @@ -1016,7 +1021,7 @@ func (m *MockService) ListAllHost(arg0 context.Context) (*v3.HostListResponse, e } // ListAllHost indicates an expected call of ListAllHost. -func (mr *MockServiceMockRecorder) ListAllHost(arg0 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllHost(arg0 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllHost", reflect.TypeOf((*MockService)(nil).ListAllHost), arg0) } @@ -1031,7 +1036,7 @@ func (m *MockService) ListAllImage(arg0 context.Context, arg1 string) (*v3.Image } // ListAllImage indicates an expected call of ListAllImage. -func (mr *MockServiceMockRecorder) ListAllImage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllImage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllImage", reflect.TypeOf((*MockService)(nil).ListAllImage), arg0, arg1) } @@ -1046,7 +1051,7 @@ func (m *MockService) ListAllNetworkSecurityRule(arg0 context.Context, arg1 stri } // ListAllNetworkSecurityRule indicates an expected call of ListAllNetworkSecurityRule. -func (mr *MockServiceMockRecorder) ListAllNetworkSecurityRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllNetworkSecurityRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllNetworkSecurityRule", reflect.TypeOf((*MockService)(nil).ListAllNetworkSecurityRule), arg0, arg1) } @@ -1061,7 +1066,7 @@ func (m *MockService) ListAllPermission(arg0 context.Context, arg1 string) (*v3. } // ListAllPermission indicates an expected call of ListAllPermission. -func (mr *MockServiceMockRecorder) ListAllPermission(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllPermission(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllPermission", reflect.TypeOf((*MockService)(nil).ListAllPermission), arg0, arg1) } @@ -1076,7 +1081,7 @@ func (m *MockService) ListAllProject(arg0 context.Context, arg1 string) (*v3.Pro } // ListAllProject indicates an expected call of ListAllProject. -func (mr *MockServiceMockRecorder) ListAllProject(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllProject(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllProject", reflect.TypeOf((*MockService)(nil).ListAllProject), arg0, arg1) } @@ -1091,7 +1096,7 @@ func (m *MockService) ListAllProtectionRules(arg0 context.Context, arg1 string) } // ListAllProtectionRules indicates an expected call of ListAllProtectionRules. -func (mr *MockServiceMockRecorder) ListAllProtectionRules(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllProtectionRules(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllProtectionRules", reflect.TypeOf((*MockService)(nil).ListAllProtectionRules), arg0, arg1) } @@ -1106,7 +1111,7 @@ func (m *MockService) ListAllRecoveryPlans(arg0 context.Context, arg1 string) (* } // ListAllRecoveryPlans indicates an expected call of ListAllRecoveryPlans. -func (mr *MockServiceMockRecorder) ListAllRecoveryPlans(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllRecoveryPlans(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllRecoveryPlans", reflect.TypeOf((*MockService)(nil).ListAllRecoveryPlans), arg0, arg1) } @@ -1121,7 +1126,7 @@ func (m *MockService) ListAllRole(arg0 context.Context, arg1 string) (*v3.RoleLi } // ListAllRole indicates an expected call of ListAllRole. -func (mr *MockServiceMockRecorder) ListAllRole(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllRole(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllRole", reflect.TypeOf((*MockService)(nil).ListAllRole), arg0, arg1) } @@ -1136,7 +1141,7 @@ func (m *MockService) ListAllServiceGroups(arg0 context.Context, arg1 string) (* } // ListAllServiceGroups indicates an expected call of ListAllServiceGroups. -func (mr *MockServiceMockRecorder) ListAllServiceGroups(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllServiceGroups(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllServiceGroups", reflect.TypeOf((*MockService)(nil).ListAllServiceGroups), arg0, arg1) } @@ -1151,7 +1156,7 @@ func (m *MockService) ListAllSubnet(arg0 context.Context, arg1 string, arg2 []*p } // ListAllSubnet indicates an expected call of ListAllSubnet. -func (mr *MockServiceMockRecorder) ListAllSubnet(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllSubnet(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllSubnet", reflect.TypeOf((*MockService)(nil).ListAllSubnet), arg0, arg1, arg2) } @@ -1166,7 +1171,7 @@ func (m *MockService) ListAllUser(arg0 context.Context, arg1 string) (*v3.UserLi } // ListAllUser indicates an expected call of ListAllUser. -func (mr *MockServiceMockRecorder) ListAllUser(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllUser(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllUser", reflect.TypeOf((*MockService)(nil).ListAllUser), arg0, arg1) } @@ -1181,7 +1186,7 @@ func (m *MockService) ListAllUserGroup(arg0 context.Context, arg1 string) (*v3.U } // ListAllUserGroup indicates an expected call of ListAllUserGroup. -func (mr *MockServiceMockRecorder) ListAllUserGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllUserGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllUserGroup", reflect.TypeOf((*MockService)(nil).ListAllUserGroup), arg0, arg1) } @@ -1196,7 +1201,7 @@ func (m *MockService) ListAllVM(arg0 context.Context, arg1 string) (*v3.VMListIn } // ListAllVM indicates an expected call of ListAllVM. -func (mr *MockServiceMockRecorder) ListAllVM(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListAllVM(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllVM", reflect.TypeOf((*MockService)(nil).ListAllVM), arg0, arg1) } @@ -1211,7 +1216,7 @@ func (m *MockService) ListCategories(arg0 context.Context, arg1 *v3.CategoryList } // ListCategories indicates an expected call of ListCategories. -func (mr *MockServiceMockRecorder) ListCategories(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListCategories(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListCategories", reflect.TypeOf((*MockService)(nil).ListCategories), arg0, arg1) } @@ -1226,7 +1231,7 @@ func (m *MockService) ListCategoryValues(arg0 context.Context, arg1 string, arg2 } // ListCategoryValues indicates an expected call of ListCategoryValues. -func (mr *MockServiceMockRecorder) ListCategoryValues(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListCategoryValues(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListCategoryValues", reflect.TypeOf((*MockService)(nil).ListCategoryValues), arg0, arg1, arg2) } @@ -1241,7 +1246,7 @@ func (m *MockService) ListCluster(arg0 context.Context, arg1 *v3.DSMetadata) (*v } // ListCluster indicates an expected call of ListCluster. -func (mr *MockServiceMockRecorder) ListCluster(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListCluster(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListCluster", reflect.TypeOf((*MockService)(nil).ListCluster), arg0, arg1) } @@ -1256,7 +1261,7 @@ func (m *MockService) ListHost(arg0 context.Context, arg1 *v3.DSMetadata) (*v3.H } // ListHost indicates an expected call of ListHost. -func (mr *MockServiceMockRecorder) ListHost(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListHost(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListHost", reflect.TypeOf((*MockService)(nil).ListHost), arg0, arg1) } @@ -1271,7 +1276,7 @@ func (m *MockService) ListImage(arg0 context.Context, arg1 *v3.DSMetadata) (*v3. } // ListImage indicates an expected call of ListImage. -func (mr *MockServiceMockRecorder) ListImage(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListImage(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListImage", reflect.TypeOf((*MockService)(nil).ListImage), arg0, arg1) } @@ -1286,7 +1291,7 @@ func (m *MockService) ListNetworkSecurityRule(arg0 context.Context, arg1 *v3.DSM } // ListNetworkSecurityRule indicates an expected call of ListNetworkSecurityRule. -func (mr *MockServiceMockRecorder) ListNetworkSecurityRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListNetworkSecurityRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListNetworkSecurityRule", reflect.TypeOf((*MockService)(nil).ListNetworkSecurityRule), arg0, arg1) } @@ -1301,7 +1306,7 @@ func (m *MockService) ListPermission(arg0 context.Context, arg1 *v3.DSMetadata) } // ListPermission indicates an expected call of ListPermission. -func (mr *MockServiceMockRecorder) ListPermission(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListPermission(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListPermission", reflect.TypeOf((*MockService)(nil).ListPermission), arg0, arg1) } @@ -1316,7 +1321,7 @@ func (m *MockService) ListProject(arg0 context.Context, arg1 *v3.DSMetadata) (*v } // ListProject indicates an expected call of ListProject. -func (mr *MockServiceMockRecorder) ListProject(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListProject(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListProject", reflect.TypeOf((*MockService)(nil).ListProject), arg0, arg1) } @@ -1331,7 +1336,7 @@ func (m *MockService) ListProtectionRules(arg0 context.Context, arg1 *v3.DSMetad } // ListProtectionRules indicates an expected call of ListProtectionRules. -func (mr *MockServiceMockRecorder) ListProtectionRules(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListProtectionRules(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListProtectionRules", reflect.TypeOf((*MockService)(nil).ListProtectionRules), arg0, arg1) } @@ -1346,7 +1351,7 @@ func (m *MockService) ListRecoveryPlanJobs(arg0 context.Context, arg1 *v3.DSMeta } // ListRecoveryPlanJobs indicates an expected call of ListRecoveryPlanJobs. -func (mr *MockServiceMockRecorder) ListRecoveryPlanJobs(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListRecoveryPlanJobs(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListRecoveryPlanJobs", reflect.TypeOf((*MockService)(nil).ListRecoveryPlanJobs), arg0, arg1) } @@ -1361,7 +1366,7 @@ func (m *MockService) ListRecoveryPlans(arg0 context.Context, arg1 *v3.DSMetadat } // ListRecoveryPlans indicates an expected call of ListRecoveryPlans. -func (mr *MockServiceMockRecorder) ListRecoveryPlans(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListRecoveryPlans(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListRecoveryPlans", reflect.TypeOf((*MockService)(nil).ListRecoveryPlans), arg0, arg1) } @@ -1376,7 +1381,7 @@ func (m *MockService) ListRole(arg0 context.Context, arg1 *v3.DSMetadata) (*v3.R } // ListRole indicates an expected call of ListRole. -func (mr *MockServiceMockRecorder) ListRole(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListRole(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListRole", reflect.TypeOf((*MockService)(nil).ListRole), arg0, arg1) } @@ -1391,7 +1396,7 @@ func (m *MockService) ListSubnet(arg0 context.Context, arg1 *v3.DSMetadata) (*v3 } // ListSubnet indicates an expected call of ListSubnet. -func (mr *MockServiceMockRecorder) ListSubnet(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListSubnet(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListSubnet", reflect.TypeOf((*MockService)(nil).ListSubnet), arg0, arg1) } @@ -1406,7 +1411,7 @@ func (m *MockService) ListUser(arg0 context.Context, arg1 *v3.DSMetadata) (*v3.U } // ListUser indicates an expected call of ListUser. -func (mr *MockServiceMockRecorder) ListUser(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListUser(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListUser", reflect.TypeOf((*MockService)(nil).ListUser), arg0, arg1) } @@ -1421,7 +1426,7 @@ func (m *MockService) ListUserGroup(arg0 context.Context, arg1 *v3.DSMetadata) ( } // ListUserGroup indicates an expected call of ListUserGroup. -func (mr *MockServiceMockRecorder) ListUserGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListUserGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListUserGroup", reflect.TypeOf((*MockService)(nil).ListUserGroup), arg0, arg1) } @@ -1436,7 +1441,7 @@ func (m *MockService) ListVM(arg0 context.Context, arg1 *v3.DSMetadata) (*v3.VML } // ListVM indicates an expected call of ListVM. -func (mr *MockServiceMockRecorder) ListVM(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListVM(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListVM", reflect.TypeOf((*MockService)(nil).ListVM), arg0, arg1) } @@ -1451,7 +1456,7 @@ func (m *MockService) ListVolumeGroup(arg0 context.Context, arg1 *v3.DSMetadata) } // ListVolumeGroup indicates an expected call of ListVolumeGroup. -func (mr *MockServiceMockRecorder) ListVolumeGroup(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ListVolumeGroup(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListVolumeGroup", reflect.TypeOf((*MockService)(nil).ListVolumeGroup), arg0, arg1) } @@ -1466,7 +1471,7 @@ func (m *MockService) PerformRecoveryPlanJobAction(arg0 context.Context, arg1, a } // PerformRecoveryPlanJobAction indicates an expected call of PerformRecoveryPlanJobAction. -func (mr *MockServiceMockRecorder) PerformRecoveryPlanJobAction(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) PerformRecoveryPlanJobAction(arg0, arg1, arg2, arg3 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PerformRecoveryPlanJobAction", reflect.TypeOf((*MockService)(nil).PerformRecoveryPlanJobAction), arg0, arg1, arg2, arg3) } @@ -1480,7 +1485,7 @@ func (m *MockService) ProcessProtectionRule(arg0 context.Context, arg1 string) e } // ProcessProtectionRule indicates an expected call of ProcessProtectionRule. -func (mr *MockServiceMockRecorder) ProcessProtectionRule(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) ProcessProtectionRule(arg0, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProcessProtectionRule", reflect.TypeOf((*MockService)(nil).ProcessProtectionRule), arg0, arg1) } @@ -1495,7 +1500,7 @@ func (m *MockService) UpdateAccessControlPolicy(arg0 context.Context, arg1 strin } // UpdateAccessControlPolicy indicates an expected call of UpdateAccessControlPolicy. -func (mr *MockServiceMockRecorder) UpdateAccessControlPolicy(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateAccessControlPolicy(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateAccessControlPolicy", reflect.TypeOf((*MockService)(nil).UpdateAccessControlPolicy), arg0, arg1, arg2) } @@ -1509,7 +1514,7 @@ func (m *MockService) UpdateAddressGroup(arg0 context.Context, arg1 string, arg2 } // UpdateAddressGroup indicates an expected call of UpdateAddressGroup. -func (mr *MockServiceMockRecorder) UpdateAddressGroup(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateAddressGroup(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateAddressGroup", reflect.TypeOf((*MockService)(nil).UpdateAddressGroup), arg0, arg1, arg2) } @@ -1524,7 +1529,7 @@ func (m *MockService) UpdateImage(arg0 context.Context, arg1 string, arg2 *v3.Im } // UpdateImage indicates an expected call of UpdateImage. -func (mr *MockServiceMockRecorder) UpdateImage(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateImage(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateImage", reflect.TypeOf((*MockService)(nil).UpdateImage), arg0, arg1, arg2) } @@ -1539,7 +1544,7 @@ func (m *MockService) UpdateNetworkSecurityRule(arg0 context.Context, arg1 strin } // UpdateNetworkSecurityRule indicates an expected call of UpdateNetworkSecurityRule. -func (mr *MockServiceMockRecorder) UpdateNetworkSecurityRule(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateNetworkSecurityRule(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateNetworkSecurityRule", reflect.TypeOf((*MockService)(nil).UpdateNetworkSecurityRule), arg0, arg1, arg2) } @@ -1554,7 +1559,7 @@ func (m *MockService) UpdateProject(arg0 context.Context, arg1 string, arg2 *v3. } // UpdateProject indicates an expected call of UpdateProject. -func (mr *MockServiceMockRecorder) UpdateProject(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateProject(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateProject", reflect.TypeOf((*MockService)(nil).UpdateProject), arg0, arg1, arg2) } @@ -1569,7 +1574,7 @@ func (m *MockService) UpdateProtectionRule(arg0 context.Context, arg1 string, ar } // UpdateProtectionRule indicates an expected call of UpdateProtectionRule. -func (mr *MockServiceMockRecorder) UpdateProtectionRule(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateProtectionRule(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateProtectionRule", reflect.TypeOf((*MockService)(nil).UpdateProtectionRule), arg0, arg1, arg2) } @@ -1584,7 +1589,7 @@ func (m *MockService) UpdateRecoveryPlan(arg0 context.Context, arg1 string, arg2 } // UpdateRecoveryPlan indicates an expected call of UpdateRecoveryPlan. -func (mr *MockServiceMockRecorder) UpdateRecoveryPlan(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateRecoveryPlan(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateRecoveryPlan", reflect.TypeOf((*MockService)(nil).UpdateRecoveryPlan), arg0, arg1, arg2) } @@ -1599,7 +1604,7 @@ func (m *MockService) UpdateRole(arg0 context.Context, arg1 string, arg2 *v3.Rol } // UpdateRole indicates an expected call of UpdateRole. -func (mr *MockServiceMockRecorder) UpdateRole(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateRole(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateRole", reflect.TypeOf((*MockService)(nil).UpdateRole), arg0, arg1, arg2) } @@ -1613,7 +1618,7 @@ func (m *MockService) UpdateServiceGroup(arg0 context.Context, arg1 string, arg2 } // UpdateServiceGroup indicates an expected call of UpdateServiceGroup. -func (mr *MockServiceMockRecorder) UpdateServiceGroup(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateServiceGroup(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateServiceGroup", reflect.TypeOf((*MockService)(nil).UpdateServiceGroup), arg0, arg1, arg2) } @@ -1628,7 +1633,7 @@ func (m *MockService) UpdateSubnet(arg0 context.Context, arg1 string, arg2 *v3.S } // UpdateSubnet indicates an expected call of UpdateSubnet. -func (mr *MockServiceMockRecorder) UpdateSubnet(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateSubnet(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateSubnet", reflect.TypeOf((*MockService)(nil).UpdateSubnet), arg0, arg1, arg2) } @@ -1643,7 +1648,7 @@ func (m *MockService) UpdateUser(arg0 context.Context, arg1 string, arg2 *v3.Use } // UpdateUser indicates an expected call of UpdateUser. -func (mr *MockServiceMockRecorder) UpdateUser(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateUser(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUser", reflect.TypeOf((*MockService)(nil).UpdateUser), arg0, arg1, arg2) } @@ -1658,7 +1663,7 @@ func (m *MockService) UpdateVM(arg0 context.Context, arg1 string, arg2 *v3.VMInt } // UpdateVM indicates an expected call of UpdateVM. -func (mr *MockServiceMockRecorder) UpdateVM(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateVM(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateVM", reflect.TypeOf((*MockService)(nil).UpdateVM), arg0, arg1, arg2) } @@ -1673,7 +1678,7 @@ func (m *MockService) UpdateVolumeGroup(arg0 context.Context, arg1 string, arg2 } // UpdateVolumeGroup indicates an expected call of UpdateVolumeGroup. -func (mr *MockServiceMockRecorder) UpdateVolumeGroup(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UpdateVolumeGroup(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateVolumeGroup", reflect.TypeOf((*MockService)(nil).UpdateVolumeGroup), arg0, arg1, arg2) } @@ -1687,7 +1692,7 @@ func (m *MockService) UploadImage(arg0 context.Context, arg1, arg2 string) error } // UploadImage indicates an expected call of UploadImage. -func (mr *MockServiceMockRecorder) UploadImage(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockServiceMockRecorder) UploadImage(arg0, arg1, arg2 any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UploadImage", reflect.TypeOf((*MockService)(nil).UploadImage), arg0, arg1, arg2) } diff --git a/pkg/context/context_test.go b/pkg/context/context_test.go index 8bb850ea73..553ff54e3a 100644 --- a/pkg/context/context_test.go +++ b/pkg/context/context_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" capiv1 "sigs.k8s.io/cluster-api/api/v1beta1" ctlclient "sigs.k8s.io/controller-runtime/pkg/client"