Skip to content

Commit ddcd4e5

Browse files
committed
Added version fixes
1 parent f20749a commit ddcd4e5

File tree

7 files changed

+5
-66
lines changed

7 files changed

+5
-66
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ debug.test
2424
docs/solutions/rhel74_image/ipxe.sh
2525
vendor/github.com/oracle/oci-go-sdk/target
2626
*.test
27+
.gitmodules
2728
internal/record
2829
.terraform.lock.hcl
2930
dist/

.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
## 6.3.1 (Unreleased)
1+
## 6.4.0 (Unreleased)
22

33
### Added
44
- Support for APM - Synthetics - SQL Monitor Type Support
55
- Support for Oracle Sharded Database
66
- Support for ADB-S: Licenses Input option for better BYOL flexibility
7-
the cleanup files
87
- Support for Data Safe - Usability enhancements to data discovery feature
98
- Support for Operations Insights : MYSQL Analytics
109
- Support for [Add subscriptionId attribute support for AutonomousDatabase resource] Terraform Setup
1110
- Support for Add subscriptionId attribute support for Cloud Exa Infra/VM Cluster
1211
- Support for ExaDB-C@C OKV Integration Phase 2 with EXACC to Manage TDE Keys Dataguard / Create DB
13-
- Support for linting check migrate to pipeline
1412
### Bug Fix
15-
- Added env.ENABLE_LINT_FOR_BACKWARD_COMPATIBILITY_FOR_ALL_RESOURCES
1613
- Terraform bug fixes - Data safe Audit (Provider-Only)
1714

1815
## 6.3.0 (July 16, 2024)

GNUmakefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ run_regex := $(if $(run), -run $(run), )
1313
test_tags := $(if $(tags), -tags $(tags), )
1414
skip_goimports_check_flag := $(if $(skip_goimports_check), -s, )
1515

16-
export PR_ID := $(patsubst PR-%,%,$(BLD_BRANCH))
17-
export SCRIPT_ARG := run_lint_checks.py --pull_request_id=$(PR_ID)
1816
## This rule will set GO mod environment variables so that builds/tests are using the vendor folder
1917
## May need to remove this in future so that it doesn't interfere with environment settings of .travis.yml file
2018
gomodenv:
@@ -163,6 +161,3 @@ check-untagged-tests:
163161

164162
check-module-name:
165163
@sh -c "'$(CURDIR)/scripts/gomodnamecheck.sh'"
166-
167-
buildpyEnv:
168-
cd ./terraform-test-resources/dev_tools/teamcity_scripts/python_script; @echo $(SCRIPT_ARG) ; sh run_python_script.sh

internal/globalvar/version.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import (
77
"log"
88
)
99

10-
const Version = "6.3.1"
10+
const Version = "6.4.0"
11+
1112
const ReleaseDate = "2024-07-24"
1213

1314
func PrintVersion() {

ocibuild.conf

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -27,58 +27,9 @@ authCompartmentOcid: "ocid1.compartment.oc1..aaaaaaaayowcmwbljnoub4fyirytbmpbksw
2727

2828
steps:
2929
[
30-
{
31-
name: git_clone
32-
type: git
33-
buildTimeout: 25
34-
gitCloneType: "shallow"
35-
cloneSubmodules: "true"
36-
environment: {
37-
"https_proxy": "http://www-proxy.us.oracle.com:80",
38-
"http_proxy": "http://www-proxy.us.oracle.com:80",
39-
"no_proxy": "127.0.0.0,localhost,us.oracle.com,oraclecorp.com"
40-
}
41-
artifacts: [ "**" ]
42-
},
43-
{
44-
name: terraform_providers_linting
45-
type: make
46-
runnerImage: build-runner-python-ol8
47-
dependsOn: [git_clone]
48-
environment: {
49-
"ENABLE_LINT_FOR_BACKWARD_COMPATIBILITY_FOR_ALL_RESOURCES": "false"
50-
}
51-
makeCommands:
52-
[
53-
{
54-
target: "buildpyEnv"
55-
}
56-
]
57-
compartmentOcid: "ocid1.compartment.oc1..aaaaaaaapq5mkp2y2umggvc3qx4wcdno3gxbhlrqp444ydwzhyjr46jj47cq"
58-
secrets:
59-
[
60-
{
61-
envVarName: "JIRA_USERNAME",
62-
secretServicePath: "/secret/terraform-provider/jira_username/latest"
63-
},
64-
{
65-
envVarName: "JIRA_PASSWORD",
66-
secretServicePath: "/secret/terraform-provider/jirapassword/latest"
67-
},
68-
{
69-
envVarName: "BITBUCKET_PASSWORD",
70-
secretServicePath: "/secret/terraform-provider/bitbucketpassword/latest"
71-
},
72-
{
73-
envVarName: "BITBUCKET_USERNAME",
74-
secretServicePath: "/secret/terraform-provider/bitbucket_username/latest"
75-
}
76-
]
77-
},
7830
{
7931
name: go_install
8032
type: golang
81-
dependsOn: [git_clone]
8233
environment: {
8334
"GOFLAGS": "-mod=vendor",
8435
"GO111MODULE": "on"
@@ -96,7 +47,6 @@ steps:
9647
{
9748
name: unit_test_with_code_coverage
9849
type: golang
99-
dependsOn: [git_clone]
10050
environment: {
10151
"GOFLAGS": "-mod=vendor",
10252
"GO111MODULE": "on"
@@ -144,5 +94,5 @@ steps:
14494
artifacts: [
14595
"**"
14696
]
147-
}
97+
},
14898
]

terraform-test-resources

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)