Skip to content

Fix type-o in test name.#6086

Merged
laxmikantbpandhare merged 3 commits intooperator-framework:masterfrom
davidlanouette:6085
Oct 17, 2022
Merged

Fix type-o in test name.#6086
laxmikantbpandhare merged 3 commits intooperator-framework:masterfrom
davidlanouette:6085

Conversation

@davidlanouette
Copy link
Contributor

@davidlanouette davidlanouette commented Oct 14, 2022

Description of the change:
Fix type-o in test name.
I've also fixed a few other type-o's and spelling mistakes.

Motivation for the change:
#6085

Checklist

If the pull request includes user-facing changes, extra documentation is required:

I've also fixed a few other type-o's and spelling mistakes.

Signed-off-by: David Lanouette <[email protected]>
@openshift-ci openshift-ci bot requested review from asmacdo and joelanford October 14, 2022 14:54
Copy link
Contributor

@everettraven everettraven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidlanouette thanks for the typo fixes! These look good to me.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2022
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 14, 2022 20:01 Inactive
Copy link
Member

@laxmikantbpandhare laxmikantbpandhare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@davidlanouette thanks for your PR.

@laxmikantbpandhare
Copy link
Member

can you please run make test-sanity and check why it is failing once before we merge this PR? If you find any changes after command execution, you can push those changes to the PR.

…operator-framework" -asmflags "all=-trimpath=/Users/dlanouet/code/opensource/operator-framework" -ldflags " -X 'github.com/operator-framework/operator-sdk/internal/version.Version=v1.24.0+git' -X 'github.com/operator-framework/operator-sdk/internal/version.GitVersion=v1.24.0-9-g2181a063-dirty' -X 'github.com/operator-framework/operator-sdk/internal/version.GitCommit=2181a063d750e4648b676950fcabe1a3baf3f8ae' -X 'github.com/operator-framework/operator-sdk/internal/version.KubernetesVersion=v1.25.0' -X 'github.com/operator-framework/operator-sdk/internal/version.ImageVersion=v1.24.0' " -o build ./cmd/{operator-sdk,ansible-operator,helm-operator}

rm -rf testdata
go run ./hack/generate/cncf-maintainers/main.go
go run ./hack/generate/cli-doc/gen-cli-doc.go
go run ./hack/generate/samples/generate_testdata.go
running: docker rmi -f quay.io/example/memcached-operator:v0.0.1
warning: docker rmi -f quay.io/example/memcached-operator:v0.0.1 failed with error: (chdir /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/helm/memcached-operator: no such file or directory)
cleaning up tools
preparing testing directory: /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/helm/memcached-operator
running: operator-sdk init --plugins helm --domain example.com --group cache --version v1alpha1 --kind Memcached --helm-chart ../../../hack/generate/samples/internal/helm/testdata/memcached-0.0.2.tgz
running: make bundle IMG=quay.io/example/memcached-operator:v0.0.1
running: docker rmi -f quay.io/example/memcached-operator:v0.0.1
warning: docker rmi -f quay.io/example/memcached-operator:v0.0.1 failed with error: (chdir /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/ansible/memcached-operator: no such file or directory)
cleaning up tools
preparing testing directory: /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/ansible/memcached-operator
running: operator-sdk init --plugins ansible --group cache --version v1alpha1 --kind Memcached --domain example.com --generate-role --generate-playbook
running: make bundle IMG=quay.io/example/memcached-operator:v0.0.1
running: docker rmi -f quay.io/example/memcached-operator:v0.0.1
warning: docker rmi -f quay.io/example/memcached-operator:v0.0.1 failed with error: (chdir /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/go/v3/memcached-operator: no such file or directory)
cleaning up tools
preparing testing directory: /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/go/v3/memcached-operator
running: operator-sdk init --plugins go/v3 --project-version 3 --repo github.com/example/memcached-operator --domain example.com
running: operator-sdk create api --group cache --version v1alpha1 --kind Memcached --plugins deploy-image/v1-alpha --image memcached:1.4.36-alpine --image-container-command memcached,-m=64,-o,modern,-v --image-container-port 11211 --run-as-user 1001 --make=false --manifests=false
running: operator-sdk create webhook --group cache --version v1alpha1 --kind Memcached --defaulting --defaulting
running: go mod tidy
running: make bundle IMG=quay.io/example/memcached-operator:v0.0.1
running: make fmt
running: docker rmi -f quay.io/example/memcached-operator:v0.0.1
warning: docker rmi -f quay.io/example/memcached-operator:v0.0.1 failed with error: (chdir /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/go/v4-alpha/memcached-operator: no such file or directory)
cleaning up tools
preparing testing directory: /Users/dlanouet/code/opensource/operator-framework/operator-sdk/testdata/go/v4-alpha/memcached-operator
running: operator-sdk init --plugins go/v3 --project-version 3 --repo github.com/example/memcached-operator --domain example.com
running: operator-sdk create api --group cache --version v1alpha1 --kind Memcached --plugins deploy-image/v1-alpha --image memcached:1.4.36-alpine --image-container-command memcached,-m=64,-o,modern,-v --image-container-port 11211 --run-as-user 1001 --make=false --manifests=false
running: operator-sdk create webhook --group cache --version v1alpha1 --kind Memcached --defaulting --defaulting
running: go mod tidy
running: make bundle IMG=quay.io/example/memcached-operator:v0.0.1
running: make fmt
go generate ./... to update test data

Signed-off-by: David Lanouette <[email protected]>
@davidlanouette
Copy link
Contributor Author

@laxmikantbpandhare after running make test-sanity, I get a) a bunch of files that have been changed - either from make generate, or make fix. I'm not sure why the changes, because they are all in files I didn't touch.

But the actual "errors" are lint errors.

internal/cmd/ansible-operator/version/cmd_test.go:19:2: SA1019: package io/ioutil is deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)
	"io/ioutil"
	^
images/scorecard-test-kuttl/main.go:22:2: SA1019: package io/ioutil is deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)
	"io/ioutil"
	^
internal/ansible/watches/watches.go:22:2: SA1019: package io/ioutil is deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)
	"io/ioutil"
	^
make: *** [fix] Error 1

@davidlanouette
Copy link
Contributor Author

After merging master into this branch, and committing a couple of changes from make generate, make test-sanity passes.

@laxmikantbpandhare is it generally OK to push these changes?

@everettraven
Copy link
Contributor

@davidlanouette pushing up the merge with master is fine. We updated to Go 1.19 in a PR that got merged earlier today. In Go 1.19 the ioutil package was removed so we had to perform a whole bunch of changes to update our ioutil usage to another package. These are the same changes that you probably saw earlier when running make test-sanity prior to merging master.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2022
@openshift-ci
Copy link

openshift-ci bot commented Oct 17, 2022

New changes are detected. LGTM label has been removed.

@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@davidlanouette davidlanouette temporarily deployed to deploy October 17, 2022 20:15 Inactive
@laxmikantbpandhare
Copy link
Member

After merging master into this branch, and committing a couple of changes from make generate, make test-sanity passes.

@laxmikantbpandhare is it generally OK to push these changes?

that's great. io/ioutil is already fixed as explained by @everettraven. If you did the rebase with master then it will work for sure.

@laxmikantbpandhare laxmikantbpandhare merged commit 23bba25 into operator-framework:master Oct 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Typo in e2e generation code: addTestE2eMaekefileTarget should be addTestE2eMakefileTarget

3 participants