Skip to content

Commit

Permalink
Merge pull request #480 from okta/prep-release
Browse files Browse the repository at this point in the history
prep release v5.0.0
  • Loading branch information
duytiennguyen-okta authored Jul 26, 2024
2 parents 4511c33 + ff2760a commit 0f82029
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .generator/config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prepareReleaseBranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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]

Expand Down
28 changes: 2 additions & 26 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/okta/okta-sdk-golang/v4
module github.com/okta/okta-sdk-golang/v5

go 1.20

Expand Down

0 comments on commit 0f82029

Please sign in to comment.