diff --git a/.secrets.baseline b/.secrets.baseline index c7f0e310..d0fe2e1c 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "go.sum|package-lock.json|^.secrets.baseline$", "lines": null }, - "generated_at": "2022-07-15T17:48:04Z", + "generated_at": "2023-02-24T00:32:11Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -98,7 +98,7 @@ "hashed_secret": "98635b2eaa2379f28cd6d72a38299f286b81b459", "is_secret": false, "is_verified": false, - "line_number": 546, + "line_number": 547, "type": "Secret Keyword", "verified_result": null }, @@ -106,7 +106,7 @@ "hashed_secret": "47fcf185ee7e15fe05cae31fbe9e4ebe4a06a40d", "is_secret": false, "is_verified": false, - "line_number": 595, + "line_number": 596, "type": "Secret Keyword", "verified_result": null } @@ -116,17 +116,17 @@ "hashed_secret": "bc2f74c22f98f7b6ffbc2f67453dbfa99bce9a32", "is_secret": false, "is_verified": false, - "line_number": 645, + "line_number": 689, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/base_service_test.go": [ + "core/base_service_test.go": [ { "hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c", "is_secret": false, "is_verified": false, - "line_number": 1251, + "line_number": 1250, "type": "Secret Keyword", "verified_result": null }, @@ -134,7 +134,7 @@ "hashed_secret": "84ba4ce8a59ed2d6e90726d57cdc4a927d3672b2", "is_secret": false, "is_verified": false, - "line_number": 1488, + "line_number": 1487, "type": "Secret Keyword", "verified_result": null }, @@ -142,7 +142,7 @@ "hashed_secret": "62cdb7020ff920e5aa642c3d4066950dd1f01f4d", "is_secret": false, "is_verified": false, - "line_number": 1531, + "line_number": 1530, "type": "Secret Keyword", "verified_result": null }, @@ -150,7 +150,7 @@ "hashed_secret": "ec7ec9d8ff520250fd5ca955c6474c6d70022407", "is_secret": false, "is_verified": false, - "line_number": 1539, + "line_number": 1538, "type": "JSON Web Token", "verified_result": null }, @@ -158,7 +158,7 @@ "hashed_secret": "40ce4379f5763c05b71c88f9a371809fdbce6a21", "is_secret": false, "is_verified": false, - "line_number": 1633, + "line_number": 1632, "type": "Secret Keyword", "verified_result": null }, @@ -166,17 +166,17 @@ "hashed_secret": "9addbf544119efa4a64223b649750a510f0d463f", "is_secret": false, "is_verified": false, - "line_number": 1659, + "line_number": 1658, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/basic_authenticator_test.go": [ + "core/basic_authenticator_test.go": [ { "hashed_secret": "62cdb7020ff920e5aa642c3d4066950dd1f01f4d", "is_secret": false, "is_verified": false, - "line_number": 69, + "line_number": 70, "type": "Secret Keyword", "verified_result": null }, @@ -184,7 +184,7 @@ "hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c", "is_secret": false, "is_verified": false, - "line_number": 93, + "line_number": 94, "type": "Secret Keyword", "verified_result": null }, @@ -192,7 +192,7 @@ "hashed_secret": "edbd5e119f94badb9f99a67ac6ff4c7a5204ad61", "is_secret": false, "is_verified": false, - "line_number": 100, + "line_number": 101, "type": "Secret Keyword", "verified_result": null }, @@ -200,12 +200,12 @@ "hashed_secret": "84ba4ce8a59ed2d6e90726d57cdc4a927d3672b2", "is_secret": false, "is_verified": false, - "line_number": 107, + "line_number": 108, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/common_test.go": [ + "core/common_test.go": [ { "hashed_secret": "e4f50034475acff058e17b35679f8ef1e54f86c5", "is_secret": false, @@ -271,12 +271,12 @@ "verified_result": null } ], - "v5/core/config_utils.go": [ + "core/config_utils.go": [ { "hashed_secret": "fed915afaba64ebcdfeb805d59ea09a33275c423", "is_secret": false, "is_verified": false, - "line_number": 157, + "line_number": 156, "type": "Secret Keyword", "verified_result": null }, @@ -284,12 +284,12 @@ "hashed_secret": "c1bd026029d704c1543f56c9b0817395bec76165", "is_secret": false, "is_verified": false, - "line_number": 161, + "line_number": 160, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/config_utils_test.go": [ + "core/config_utils_test.go": [ { "hashed_secret": "1e95707b2d2cc9086c651c60bb323bb85522b334", "is_secret": false, @@ -307,7 +307,7 @@ "verified_result": null } ], - "v5/core/constants.go": [ + "core/constants.go": [ { "hashed_secret": "fdee05598fdd57ff8e9ae29e92c25a04f2c52fa6", "is_secret": false, @@ -333,7 +333,7 @@ "verified_result": null } ], - "v5/core/container_authenticator.go": [ + "core/container_authenticator.go": [ { "hashed_secret": "3c81615afb40d1889fc2e1fff551a8b59b4e80ce", "is_secret": false, @@ -351,12 +351,12 @@ "verified_result": null } ], - "v5/core/container_authenticator_test.go": [ + "core/container_authenticator_test.go": [ { "hashed_secret": "c8f0df25bade89c1873f5f01b85bcfb921443ac6", "is_secret": false, "is_verified": false, - "line_number": 40, + "line_number": 41, "type": "JSON Web Token", "verified_result": null }, @@ -364,7 +364,7 @@ "hashed_secret": "f0048c1e535178d8ba9760fd4139c2554ac53d99", "is_secret": false, "is_verified": false, - "line_number": 224, + "line_number": 225, "type": "Secret Keyword", "verified_result": null }, @@ -372,7 +372,7 @@ "hashed_secret": "d16fe0356edbf4177de06fc6cb5122837d5cd203", "is_secret": false, "is_verified": false, - "line_number": 242, + "line_number": 243, "type": "Secret Keyword", "verified_result": null }, @@ -380,17 +380,17 @@ "hashed_secret": "10ef99be8df801b05b5933e121e85385edf6b98a", "is_secret": false, "is_verified": false, - "line_number": 613, + "line_number": 614, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/cp4d_authenticator.go": [ + "core/cp4d_authenticator.go": [ { "hashed_secret": "f75b33f87ffeacb3a4f793a09693e672e07449ff", "is_secret": false, "is_verified": false, - "line_number": 102, + "line_number": 100, "type": "Secret Keyword", "verified_result": null }, @@ -398,7 +398,7 @@ "hashed_secret": "84ed7427f222c7a1f43567e1bb3058365a81bbcb", "is_secret": false, "is_verified": false, - "line_number": 288, + "line_number": 285, "type": "Secret Keyword", "verified_result": null }, @@ -406,17 +406,17 @@ "hashed_secret": "d4a9d12d425a0edaf333f49c6004b6d417eeb87b", "is_secret": false, "is_verified": false, - "line_number": 289, + "line_number": 286, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/cp4d_authenticator_test.go": [ + "core/cp4d_authenticator_test.go": [ { "hashed_secret": "ec7ec9d8ff520250fd5ca955c6474c6d70022407", "is_secret": false, "is_verified": false, - "line_number": 42, + "line_number": 43, "type": "JSON Web Token", "verified_result": null }, @@ -424,7 +424,7 @@ "hashed_secret": "f624446964a455348d97335a75468555c4375a8d", "is_secret": false, "is_verified": false, - "line_number": 44, + "line_number": 45, "type": "JSON Web Token", "verified_result": null }, @@ -432,7 +432,7 @@ "hashed_secret": "576e3a0ad157f3cf3c6c64dd574c6d86ebe09210", "is_secret": false, "is_verified": false, - "line_number": 50, + "line_number": 51, "type": "JSON Web Token", "verified_result": null }, @@ -440,7 +440,7 @@ "hashed_secret": "2e43f72bbea78272c019fb7f4abd2529e3c8ef43", "is_secret": false, "is_verified": false, - "line_number": 52, + "line_number": 53, "type": "JSON Web Token", "verified_result": null }, @@ -448,7 +448,7 @@ "hashed_secret": "b94e9f3d7e001981b2dd49f2a70822a8ac8f3e68", "is_secret": false, "is_verified": false, - "line_number": 372, + "line_number": 373, "type": "Secret Keyword", "verified_result": null }, @@ -456,7 +456,7 @@ "hashed_secret": "10db2b8939e12fa3259bf89a63eab34ee3c281b2", "is_secret": false, "is_verified": false, - "line_number": 602, + "line_number": 603, "type": "Secret Keyword", "verified_result": null }, @@ -464,7 +464,7 @@ "hashed_secret": "84ba4ce8a59ed2d6e90726d57cdc4a927d3672b2", "is_secret": false, "is_verified": false, - "line_number": 645, + "line_number": 646, "type": "Secret Keyword", "verified_result": null }, @@ -472,7 +472,7 @@ "hashed_secret": "4080eeeaf54faf879b9e8d99c49a8503f7e855bb", "is_secret": false, "is_verified": false, - "line_number": 660, + "line_number": 661, "type": "Secret Keyword", "verified_result": null }, @@ -480,27 +480,27 @@ "hashed_secret": "32e8612d8ca77c7ea8374aa7918db8e5df9252ed", "is_secret": false, "is_verified": false, - "line_number": 779, + "line_number": 780, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/gzip_test.go": [ + "core/gzip_test.go": [ { "hashed_secret": "4912eabc958e1d066ed0b9c041a1a5f2eeb19f05", "is_secret": false, "is_verified": false, - "line_number": 68, + "line_number": 69, "type": "Hex High Entropy String", "verified_result": null } ], - "v5/core/iam_authenticator.go": [ + "core/iam_authenticator.go": [ { "hashed_secret": "7a5d27bcb7a1e98b6e1bfca4df223ed578a47283", "is_secret": false, "is_verified": false, - "line_number": 95, + "line_number": 94, "type": "Secret Keyword", "verified_result": null }, @@ -508,7 +508,7 @@ "hashed_secret": "c2df5d3d760ff42f33fb38e2534d4c1b7ddde3ab", "is_secret": false, "is_verified": false, - "line_number": 95, + "line_number": 94, "type": "Secret Keyword", "verified_result": null }, @@ -516,17 +516,17 @@ "hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926", "is_secret": false, "is_verified": false, - "line_number": 131, + "line_number": 130, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/iam_authenticator_test.go": [ + "core/iam_authenticator_test.go": [ { "hashed_secret": "fd08cd887ed1de2f2d3e175117ff607ca65187ae", "is_secret": false, "is_verified": false, - "line_number": 34, + "line_number": 35, "type": "Secret Keyword", "verified_result": null }, @@ -534,7 +534,7 @@ "hashed_secret": "1f7e33de15e22de9d2eaf502df284ed25ca40018", "is_secret": false, "is_verified": false, - "line_number": 37, + "line_number": 38, "type": "Secret Keyword", "verified_result": null }, @@ -542,7 +542,7 @@ "hashed_secret": "c8f0df25bade89c1873f5f01b85bcfb921443ac6", "is_secret": false, "is_verified": false, - "line_number": 41, + "line_number": 42, "type": "JSON Web Token", "verified_result": null }, @@ -550,7 +550,7 @@ "hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c", "is_secret": false, "is_verified": false, - "line_number": 224, + "line_number": 221, "type": "Secret Keyword", "verified_result": null }, @@ -558,7 +558,7 @@ "hashed_secret": "ffc168ba60490856fec503b911fab745e277370b", "is_secret": false, "is_verified": false, - "line_number": 239, + "line_number": 236, "type": "Secret Keyword", "verified_result": null }, @@ -566,7 +566,7 @@ "hashed_secret": "84de897bbaa1dac9c7e13b27ab2afc2a233a5e4e", "is_secret": false, "is_verified": false, - "line_number": 260, + "line_number": 257, "type": "Secret Keyword", "verified_result": null }, @@ -574,7 +574,7 @@ "hashed_secret": "e952fd77963a8d1e995a104cfee55565780dffed", "is_secret": false, "is_verified": false, - "line_number": 276, + "line_number": 273, "type": "Secret Keyword", "verified_result": null }, @@ -582,7 +582,7 @@ "hashed_secret": "7480f0b7140317bd82ade3c7a9526408304d5a7f", "is_secret": false, "is_verified": false, - "line_number": 544, + "line_number": 539, "type": "Secret Keyword", "verified_result": null }, @@ -590,7 +590,7 @@ "hashed_secret": "6a0a3e8036180c23da91ede4f9d7bbfefd56e1a9", "is_secret": false, "is_verified": false, - "line_number": 1103, + "line_number": 1098, "type": "Secret Keyword", "verified_result": null }, @@ -598,17 +598,17 @@ "hashed_secret": "32e8612d8ca77c7ea8374aa7918db8e5df9252ed", "is_secret": false, "is_verified": false, - "line_number": 1125, + "line_number": 1120, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/jwt_utils_test.go": [ + "core/jwt_utils_test.go": [ { "hashed_secret": "70f702183d6df790e118caa750d2daf58ec7ff65", "is_secret": false, "is_verified": false, - "line_number": 32, + "line_number": 33, "type": "JSON Web Token", "verified_result": null }, @@ -616,7 +616,7 @@ "hashed_secret": "32e8612d8ca77c7ea8374aa7918db8e5df9252ed", "is_secret": false, "is_verified": false, - "line_number": 36, + "line_number": 37, "type": "Secret Keyword", "verified_result": null }, @@ -624,7 +624,7 @@ "hashed_secret": "3d12116a6ba9cef63775a27290d8a7dccf7f9cb2", "is_secret": false, "is_verified": false, - "line_number": 37, + "line_number": 38, "type": "Secret Keyword", "verified_result": null }, @@ -632,27 +632,27 @@ "hashed_secret": "576e3a0ad157f3cf3c6c64dd574c6d86ebe09210", "is_secret": false, "is_verified": false, - "line_number": 37, + "line_number": 38, "type": "JSON Web Token", "verified_result": null } ], - "v5/core/utils_test.go": [ + "core/utils_test.go": [ { "hashed_secret": "0266262f439c732a31b9353ced05c9e777a07c54", "is_secret": false, "is_verified": false, - "line_number": 657, + "line_number": 661, "type": "Secret Keyword", "verified_result": null } ], - "v5/core/vpc_instance_authenticator_test.go": [ + "core/vpc_instance_authenticator_test.go": [ { "hashed_secret": "c8f0df25bade89c1873f5f01b85bcfb921443ac6", "is_secret": false, "is_verified": false, - "line_number": 39, + "line_number": 40, "type": "JSON Web Token", "verified_result": null }, @@ -660,7 +660,7 @@ "hashed_secret": "8516a32b25a73aef393072725adad14498a3c3c9", "is_secret": false, "is_verified": false, - "line_number": 208, + "line_number": 209, "type": "Secret Keyword", "verified_result": null }, @@ -668,12 +668,12 @@ "hashed_secret": "af83c79c5d4a8d171a2ca5aa132013f3020c518a", "is_secret": false, "is_verified": false, - "line_number": 843, + "line_number": 842, "type": "Secret Keyword", "verified_result": null } ], - "v5/resources/ibm-credentials.env": [ + "resources/ibm-credentials.env": [ { "hashed_secret": "62cdb7020ff920e5aa642c3d4066950dd1f01f4d", "is_secret": false, @@ -707,7 +707,7 @@ "verified_result": null } ], - "v5/resources/my-credentials.env": [ + "resources/my-credentials.env": [ { "hashed_secret": "e4f50034475acff058e17b35679f8ef1e54f86c5", "is_secret": false, @@ -765,7 +765,7 @@ "verified_result": null } ], - "v5/resources/vcap_services.json": [ + "resources/vcap_services.json": [ { "hashed_secret": "d439ad476113aafc7bbf79cdf6709ad30a076228", "is_secret": false, @@ -816,7 +816,7 @@ } ] }, - "version": "0.13.1+ibm.50.dss", + "version": "0.13.1+ibm.56.dss", "word_list": { "file": null, "hash": null diff --git a/.travis.yml b/.travis.yml index a7699d7c..7fb84f2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,9 @@ language: go dist: bionic go: -- '1.16.x' -- '1.17.x' - '1.18.x' - '1.19.x' +- '1.20.x' notifications: email: false @@ -19,11 +18,13 @@ before_install: - sudo apt-get update install: - - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.49.0 + - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.51.2 - curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(go env GOPATH)/bin script: - - make all + - make tidy + - make test + - make lint - make scan-gosec before_deploy: @@ -36,5 +37,5 @@ deploy: script: npm run semantic-release skip_cleanup: true on: - go: '1.16.x' + go: '1.18.x' branch: main diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8806aff1..c47c7c7c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,8 @@ Here are some examples of acceptable commit messages, along with the release typ # Pull Requests If you want to contribute to the repository, here's a quick guide: - 1. Fork the repository + 1. Fork the repository + - If you have "write" access to the repository, you can avoid using a fork. 2. The `go-sdk-core` project uses Go modules for dependency management, so do NOT set the `GOPATH` environment variable to include your local `go-sdk-core` project directory. @@ -30,17 +31,28 @@ If you want to contribute to the repository, here's a quick guide: 4. Install the `golangci-lint` tool: ```sh - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.31.0 + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.51.2 ``` - * Note: As of this writing, the 1.31.0 version of `golangci-lint` is being used by this project. + * Note: As of this writing, the 1.51.2 version of `golangci-lint` is being used by this project. Please check the `curl` command found in the `.travis.yml` file to see the version of this tool that is currently being used at the time you are planning to commit changes. This will ensure that you are using the same version of the linter as the Travis build automation, which will ensure that you are using the same set of linter checks that the automated build uses. - 5. Make your code changes as needed. Be sure to add new tests for any new or modified functionality. + 5. Install the `gosec` tool: + ```sh + curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(go env GOPATH)/bin + ``` + + 6. Make sure that you have a clean "baseline" to work from by building/testing the project before + you start to make changes: + ```sh + make all + ``` + + 7. Make your code changes as needed. Be sure to add new tests for any new or modified functionality. - 6. Test your changes: + 8. Test your changes: ```sh make test ``` @@ -55,19 +67,25 @@ If you want to contribute to the repository, here's a quick guide: go test -tags=retries ``` - 7. Check your code for lint issues: + 9. Check your code for lint issues: ```sh make lint ``` - 8. Alternatively, to build, test and lint check in one step: + 10. To build, test and lint check in one step: ```sh make all ``` - 9. Commit your changes: + + 11. Make sure there are no security vulnerabilities by running `gosec`: + ```sh + make scan-gosec + ``` + + 12. Commit your changes: * Commit messages should follow the Angular commit message guidelines as mentioned above. - 10. Push your commit(s) to your fork and submit a pull request to the **main** branch. + 13. Push your branch to remote and submit a pull request to the **main** branch. # Developer's Certificate of Origin 1.1 diff --git a/Makefile b/Makefile index f88bdee9..8c8b6f59 100644 --- a/Makefile +++ b/Makefile @@ -3,23 +3,21 @@ GO=go LINT=golangci-lint GOSEC=gosec -VDIR=v5 - COV_OPTS=-coverprofile=coverage.txt -covermode=atomic -all: testcov lint tidy +all: tidy test lint testcov: - cd ${VDIR} && ${GO} test -tags=all ${COV_OPTS} ./... + ${GO} test -tags=all ${COV_OPTS} ./... test: - cd ${VDIR} && ${GO} test -tags=all ./... + ${GO} test -tags=all ./... lint: - cd ${VDIR} && ${LINT} run --build-tags=all + ${LINT} run --build-tags=all scan-gosec: - cd ${VDIR} && ${GOSEC} ./... + ${GOSEC} ./... tidy: - cd ${VDIR} && ${GO} mod tidy + ${GO} mod tidy diff --git a/README.md b/README.md index e4d1e0a7..6a428d92 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ go get -u github.com/IBM/go-sdk-core/... ``` ## Prerequisites -- Go version 1.16 or newer +- Go version 1.18 or newer ## Authentication The go-sdk-core project supports the following types of authentication: diff --git a/v5/core/authenticator.go b/core/authenticator.go similarity index 100% rename from v5/core/authenticator.go rename to core/authenticator.go diff --git a/v5/core/authenticator_factory.go b/core/authenticator_factory.go similarity index 100% rename from v5/core/authenticator_factory.go rename to core/authenticator_factory.go diff --git a/v5/core/authenticator_factory_test.go b/core/authenticator_factory_test.go similarity index 100% rename from v5/core/authenticator_factory_test.go rename to core/authenticator_factory_test.go diff --git a/v5/core/base_service.go b/core/base_service.go similarity index 100% rename from v5/core/base_service.go rename to core/base_service.go diff --git a/v5/core/base_service_retries_test.go b/core/base_service_retries_test.go similarity index 100% rename from v5/core/base_service_retries_test.go rename to core/base_service_retries_test.go diff --git a/v5/core/base_service_test.go b/core/base_service_test.go similarity index 100% rename from v5/core/base_service_test.go rename to core/base_service_test.go diff --git a/v5/core/basic_authenticator.go b/core/basic_authenticator.go similarity index 100% rename from v5/core/basic_authenticator.go rename to core/basic_authenticator.go diff --git a/v5/core/basic_authenticator_test.go b/core/basic_authenticator_test.go similarity index 100% rename from v5/core/basic_authenticator_test.go rename to core/basic_authenticator_test.go diff --git a/v5/core/bearer_token_authenticator.go b/core/bearer_token_authenticator.go similarity index 100% rename from v5/core/bearer_token_authenticator.go rename to core/bearer_token_authenticator.go diff --git a/v5/core/bearer_token_authenticator_test.go b/core/bearer_token_authenticator_test.go similarity index 100% rename from v5/core/bearer_token_authenticator_test.go rename to core/bearer_token_authenticator_test.go diff --git a/v5/core/common_test.go b/core/common_test.go similarity index 100% rename from v5/core/common_test.go rename to core/common_test.go diff --git a/v5/core/config_utils.go b/core/config_utils.go similarity index 100% rename from v5/core/config_utils.go rename to core/config_utils.go diff --git a/v5/core/config_utils_test.go b/core/config_utils_test.go similarity index 100% rename from v5/core/config_utils_test.go rename to core/config_utils_test.go diff --git a/v5/core/constants.go b/core/constants.go similarity index 100% rename from v5/core/constants.go rename to core/constants.go diff --git a/v5/core/container_authenticator.go b/core/container_authenticator.go similarity index 100% rename from v5/core/container_authenticator.go rename to core/container_authenticator.go diff --git a/v5/core/container_authenticator_test.go b/core/container_authenticator_test.go similarity index 100% rename from v5/core/container_authenticator_test.go rename to core/container_authenticator_test.go diff --git a/v5/core/core_suite_test.go b/core/core_suite_test.go similarity index 100% rename from v5/core/core_suite_test.go rename to core/core_suite_test.go diff --git a/v5/core/cp4d_authenticator.go b/core/cp4d_authenticator.go similarity index 100% rename from v5/core/cp4d_authenticator.go rename to core/cp4d_authenticator.go diff --git a/v5/core/cp4d_authenticator_test.go b/core/cp4d_authenticator_test.go similarity index 100% rename from v5/core/cp4d_authenticator_test.go rename to core/cp4d_authenticator_test.go diff --git a/v5/core/datetime.go b/core/datetime.go similarity index 100% rename from v5/core/datetime.go rename to core/datetime.go diff --git a/v5/core/datetime_test.go b/core/datetime_test.go similarity index 100% rename from v5/core/datetime_test.go rename to core/datetime_test.go diff --git a/v5/core/detailed_response.go b/core/detailed_response.go similarity index 100% rename from v5/core/detailed_response.go rename to core/detailed_response.go diff --git a/v5/core/detailed_response_test.go b/core/detailed_response_test.go similarity index 100% rename from v5/core/detailed_response_test.go rename to core/detailed_response_test.go diff --git a/v5/core/doc.go b/core/doc.go similarity index 100% rename from v5/core/doc.go rename to core/doc.go diff --git a/v5/core/file_with_metadata.go b/core/file_with_metadata.go similarity index 100% rename from v5/core/file_with_metadata.go rename to core/file_with_metadata.go diff --git a/v5/core/file_with_metadata_test.go b/core/file_with_metadata_test.go similarity index 100% rename from v5/core/file_with_metadata_test.go rename to core/file_with_metadata_test.go diff --git a/v5/core/gzip.go b/core/gzip.go similarity index 100% rename from v5/core/gzip.go rename to core/gzip.go diff --git a/v5/core/gzip_test.go b/core/gzip_test.go similarity index 100% rename from v5/core/gzip_test.go rename to core/gzip_test.go diff --git a/v5/core/iam_authenticator.go b/core/iam_authenticator.go similarity index 100% rename from v5/core/iam_authenticator.go rename to core/iam_authenticator.go diff --git a/v5/core/iam_authenticator_test.go b/core/iam_authenticator_test.go similarity index 100% rename from v5/core/iam_authenticator_test.go rename to core/iam_authenticator_test.go diff --git a/v5/core/jwt_utils.go b/core/jwt_utils.go similarity index 100% rename from v5/core/jwt_utils.go rename to core/jwt_utils.go diff --git a/v5/core/jwt_utils_test.go b/core/jwt_utils_test.go similarity index 100% rename from v5/core/jwt_utils_test.go rename to core/jwt_utils_test.go diff --git a/v5/core/log.go b/core/log.go similarity index 100% rename from v5/core/log.go rename to core/log.go diff --git a/v5/core/log_test.go b/core/log_test.go similarity index 100% rename from v5/core/log_test.go rename to core/log_test.go diff --git a/v5/core/marshal_nulls_test.go b/core/marshal_nulls_test.go similarity index 100% rename from v5/core/marshal_nulls_test.go rename to core/marshal_nulls_test.go diff --git a/v5/core/noauth_authenticator.go b/core/noauth_authenticator.go similarity index 100% rename from v5/core/noauth_authenticator.go rename to core/noauth_authenticator.go diff --git a/v5/core/noauth_authenticator_test.go b/core/noauth_authenticator_test.go similarity index 100% rename from v5/core/noauth_authenticator_test.go rename to core/noauth_authenticator_test.go diff --git a/v5/core/parameterized_url.go b/core/parameterized_url.go similarity index 100% rename from v5/core/parameterized_url.go rename to core/parameterized_url.go diff --git a/v5/core/parameterized_url_test.go b/core/parameterized_url_test.go similarity index 100% rename from v5/core/parameterized_url_test.go rename to core/parameterized_url_test.go diff --git a/v5/core/request_builder.go b/core/request_builder.go similarity index 100% rename from v5/core/request_builder.go rename to core/request_builder.go diff --git a/v5/core/request_builder_test.go b/core/request_builder_test.go similarity index 100% rename from v5/core/request_builder_test.go rename to core/request_builder_test.go diff --git a/v5/core/unmarshal_v2.go b/core/unmarshal_v2.go similarity index 100% rename from v5/core/unmarshal_v2.go rename to core/unmarshal_v2.go diff --git a/v5/core/unmarshal_v2_models_test.go b/core/unmarshal_v2_models_test.go similarity index 100% rename from v5/core/unmarshal_v2_models_test.go rename to core/unmarshal_v2_models_test.go diff --git a/v5/core/unmarshal_v2_primitives_test.go b/core/unmarshal_v2_primitives_test.go similarity index 100% rename from v5/core/unmarshal_v2_primitives_test.go rename to core/unmarshal_v2_primitives_test.go diff --git a/v5/core/utils.go b/core/utils.go similarity index 99% rename from v5/core/utils.go rename to core/utils.go index a84294b9..412b15ea 100644 --- a/v5/core/utils.go +++ b/core/utils.go @@ -28,7 +28,7 @@ import ( "time" "github.com/go-openapi/strfmt" - validator "gopkg.in/go-playground/validator.v9" + validator "github.com/go-playground/validator/v10" ) // Validate is a shared validator instance used to perform validation of structs. diff --git a/v5/core/utils_test.go b/core/utils_test.go similarity index 100% rename from v5/core/utils_test.go rename to core/utils_test.go diff --git a/v5/core/version.go b/core/version.go similarity index 100% rename from v5/core/version.go rename to core/version.go diff --git a/v5/core/vpc_instance_authenticator.go b/core/vpc_instance_authenticator.go similarity index 100% rename from v5/core/vpc_instance_authenticator.go rename to core/vpc_instance_authenticator.go diff --git a/v5/core/vpc_instance_authenticator_test.go b/core/vpc_instance_authenticator_test.go similarity index 100% rename from v5/core/vpc_instance_authenticator_test.go rename to core/vpc_instance_authenticator_test.go diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..f33f9abd --- /dev/null +++ b/go.mod @@ -0,0 +1,35 @@ +module github.com/IBM/go-sdk-core/v5 + +go 1.18 + +require ( + github.com/go-openapi/strfmt v0.21.3 + github.com/go-playground/validator/v10 v10.11.2 + github.com/hashicorp/go-cleanhttp v0.5.2 + github.com/hashicorp/go-retryablehttp v0.7.2 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.27.1 + github.com/stretchr/testify v1.8.1 +) + +require ( + github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/go-openapi/errors v0.20.3 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/leodido/go-urn v1.2.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/oklog/ulid v1.3.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.mongodb.org/mongo-driver v1.11.2 // indirect + golang.org/x/crypto v0.5.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/v5/go.sum b/go.sum similarity index 74% rename from v5/go.sum rename to go.sum index 8da95fbe..23dd97eb 100644 --- a/v5/go.sum +++ b/go.sum @@ -1,23 +1,27 @@ -github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGLmAjMPwCCCo7Jf0W6f9slllCkkv7vyc1yOSg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= +github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/go-openapi/errors v0.20.2 h1:dxy7PGTqEh94zj2E3h1cUmQQWiM1+aeCROfAr02EmK8= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= +github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc= +github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -26,40 +30,36 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= -github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0= +github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= @@ -68,27 +68,27 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.0 h1:ngbYoRctxjl8SiF7XgP0NxBFbfHcg3wfHMMaFHWwMTM= -github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/onsi/gomega v1.27.1 h1:rfztXRbg6nv/5f+Raen9RcGoSecHIFgBBLQK3Wdj754= +github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -96,21 +96,24 @@ github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23n github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.mongodb.org/mongo-driver v1.10.0 h1:UtV6N5k14upNp4LTduX0QCufG124fSu25Wz9tu94GLg= go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= +go.mongodb.org/mongo-driver v1.11.2 h1:+1v2rDQUWNcGW7/7E0Jvdz51V38XXxJfhzbV17aNHCw= +go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -121,21 +124,22 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -149,25 +153,17 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M= -gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/v5/resources/cr-token.txt b/resources/cr-token.txt similarity index 100% rename from v5/resources/cr-token.txt rename to resources/cr-token.txt diff --git a/v5/resources/empty-cr-token.txt b/resources/empty-cr-token.txt similarity index 100% rename from v5/resources/empty-cr-token.txt rename to resources/empty-cr-token.txt diff --git a/v5/resources/ibm-credentials.env b/resources/ibm-credentials.env similarity index 100% rename from v5/resources/ibm-credentials.env rename to resources/ibm-credentials.env diff --git a/v5/resources/my-credentials.env b/resources/my-credentials.env similarity index 100% rename from v5/resources/my-credentials.env rename to resources/my-credentials.env diff --git a/v5/resources/test_file.txt b/resources/test_file.txt similarity index 100% rename from v5/resources/test_file.txt rename to resources/test_file.txt diff --git a/v5/resources/vcap_services.json b/resources/vcap_services.json similarity index 100% rename from v5/resources/vcap_services.json rename to resources/vcap_services.json diff --git a/v5/go.mod b/v5/go.mod deleted file mode 100644 index 0e4352b9..00000000 --- a/v5/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module github.com/IBM/go-sdk-core/v5 - -go 1.16 - -require ( - github.com/go-openapi/strfmt v0.21.3 - github.com/go-playground/universal-translator v0.18.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.2 - github.com/hashicorp/go-retryablehttp v0.7.1 - github.com/leodido/go-urn v1.2.1 // indirect - github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.18.0 - github.com/stretchr/testify v1.8.0 - gopkg.in/go-playground/assert.v1 v1.2.1 // indirect - gopkg.in/go-playground/validator.v9 v9.31.0 -)