diff --git a/.circleci/config.yml b/.circleci/config.yml index a131e388..f2b5ed18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: - platform-orb/step-load-dependencies - run: name: "test stage" - command: make v4-test + command: make test # Invoke jobs via workflows # See: https://circleci.com/docs/2.0/configuration-reference/#workflows diff --git a/.generator/config.yaml b/.generator/config.yaml index 5af52122..392065d4 100644 --- a/.generator/config.yaml +++ b/.generator/config.yaml @@ -1,9 +1,9 @@ generatorName: go templateDir: ./.generator/templates -outputDir: ./okta/v4 +outputDir: ./okta/v5 gitUserId: okta gitRepoId: okta-sdk-golang -versionName: v4 +versionName: v5 additionalProperties: enumClassPrefix: true generateInterfaces: true diff --git a/.github/workflows/prepareReleaseBranch.yml b/.github/workflows/prepareReleaseBranch.yml index 85bcfa6f..c8443f49 100644 --- a/.github/workflows/prepareReleaseBranch.yml +++ b/.github/workflows/prepareReleaseBranch.yml @@ -39,11 +39,11 @@ jobs: - name: Set openapi generator version run: openapi-generator-cli version-manager set 7.0.1 - name: Generate go client - run: make v4-generate + run: make generate - run: make fmt - run: make import - - run: cd okta/v4 && mv go.mod go.sum ../../ - - run: cd okta && mv v4/* ./ && rm -rf v4 + - run: cd okta/v5 && mv go.mod go.sum ../../ + - run: cd okta && mv v5/* ./ && rm -rf v5 - name: Commit generated code uses: EndBug/add-and-commit@v9 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index fc1a0120..1c61bf44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Changelog Running changelog of releases since `2.0.0-rc.4` -## v4.1.0 +## v5.0.0 + - Update newest spec (#463) Thanks [@duytiennguyen-okta] + +## v4.1.2 + - Fix panic issue when using access token is empty (#466) Thanks [@duytiennguyen-okta] + - Fix object that does not have additional properties (#466) Thanks [@duytiennguyen-okta] + +## v4.1.1 - Fix panic issue when using bearer token (#463) Thanks [@duytiennguyen-okta] - Fix object that does not have additional properties (#463) Thanks [@duytiennguyen-okta] diff --git a/Makefile b/Makefile index 6daee5d5..dd3aa68d 100644 --- a/Makefile +++ b/Makefile @@ -52,30 +52,6 @@ ifneq ($(origin OPENAPI_SPEC_BRANCH),undefined) rm -fr spec-raw endif -test: - make test:all - -test\:all: - @echo "$(COLOR_OKTA)Running all tests...$(COLOR_NONE)" - @make test:unit - @make test:integration - -test\:integration: - @echo "$(COLOR_OKTA)Running integration tests...$(COLOR_NONE)" - go test -failfast -race ./tests/integration -test.v - -test\:unit: - @echo "$(COLOR_OK)Running unit tests...$(COLOR_NONE)" - go test -failfast -race ./tests/unit ./okta/query -test.v - -test\:integration\:all: - @echo "$(COLOR_OKTA)Running integration tests...$(COLOR_NONE)" - go test -race ./tests/integration -test.v - -test\:unit\:all: - @echo "$(COLOR_OK)Running unit tests...$(COLOR_NONE)" - go test -race ./tests/unit ./okta/query -test.v - .PHONY: fmt fmt: check-fmt # Format the code @$(GOFMT) -l -w $$(find . -name '*.go' |grep -v vendor) > /dev/null @@ -90,8 +66,8 @@ import: check-goimports check-goimports: @which $(GOIMPORTS) > /dev/null || GO111MODULE=on go install golang.org/x/tools/cmd/goimports@latest -v4-test: +test: go test -failfast -race ./okta -test.v -v4-generate: +generate: npx @openapitools/openapi-generator-cli generate -c ./.generator/config.yaml -i .generator/okta-management-APIs-oasv3-noEnums-inheritance.yaml \ No newline at end of file diff --git a/go.mod b/go.mod index fc1054c9..4f2e7cb5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/okta/okta-sdk-golang/v4 +module github.com/okta/okta-sdk-golang/v5 go 1.20