Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X #21

emanipravallika · 2024-06-05T08:23:52Z

https://devopsmx.atlassian.net/browse/OP-22085 : ParentJira
https://devopsmx.atlassian.net/browse/OP-22224 : JIra

Testing :

Compile/Build got success.
328/333 test cases are passed.
5 TC's from kayenta-integration-test module are failing. will be taken-up in another PR.

Tested in local: Kayenta instance is up and application running successfully. Able to load swagger UI.

Note:
All commits covered - verified from sheet.

…naker#930)

Co-authored-by: root <root@d02b16e0674c>

Co-authored-by: root <root@1b307cefe88f>

…unt configurations persistence. (spinnaker#938) * feat: SPLAT-569: Add a MySQL data source for account credentials and account configurations persistence. * feat: SPLAT-569: Add unit tests. * feat: SPLAT-569: Adjust type of content column. * feat: SPLAT-569: Move common fields to a base class. * feat: SPLAT-569: Fix dependencies. * feat: SPLAT-569: Fix migration.

Co-authored-by: root <root@3cb4e1a6c2a0>

Co-authored-by: root <root@09edb544a130>

…naker#946) similar to spinnaker/fiat#1036

Co-authored-by: root <root@f274a1e40998>

…innaker#948) see spinnaker/spin@7fa1646

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…o 1 (spinnaker#950) Bumps [google-github-actions/upload-cloud-storage](https://github.com/google-github-actions/upload-cloud-storage) from 0 to 1. - [Release notes](https://github.com/google-github-actions/upload-cloud-storage/releases) - [Changelog](https://github.com/google-github-actions/upload-cloud-storage/blob/main/CHANGELOG.md) - [Commits](google-github-actions/upload-cloud-storage@v0...v1) --- updated-dependencies: - dependency-name: google-github-actions/upload-cloud-storage dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [google-github-actions/auth](https://github.com/google-github-actions/auth) from 0 to 1. - [Release notes](https://github.com/google-github-actions/auth/releases) - [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md) - [Commits](google-github-actions/auth@v0...v1) --- updated-dependencies: - dependency-name: google-github-actions/auth dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v2...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

see spinnaker/rosco#966 for background

…iles (spinnaker#955) to avoid warning messages like Run echo ::set-output name=REPO::${GITHUB_REPOSITORY##*/} Warning: The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ Warning: The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/

* feat: SPLAT-582: Add a storage data migrator. * feat: SPLAT-582: Add warning log when migrating object already exists. * feat: SPLAT-582: Remove SQL word from data migration properties. * feat: SPLAT-582: Adjust logs. * feat: SPLAT-582: Adjust configs.

… parent class (spinnaker#957)

…id) (spinnaker#939) Co-authored-by: Mark Rampton <[email protected]>

Co-authored-by: root <root@daa08b560ddd>

…rom kayenta in order to upgrade gradle 7 (spinnaker#961) While executing the build script with --warning-mode=fail received below error: ``` Deprecated Gradle features were used in this build, making it incompatible with Gradle 7.0 ``` And the deprecated gradle features are: ``` > Configure project :kayenta-graphite Adding a Configuration as a dependency is a confusing behavior which isn't recommended. This behaviour has been deprecated and is scheduled to be removed in Gradle 8.0. If you're interested in inheriting the dependencies from the Configuration you are adding, you should use Configuration#extendsFrom instead. See https://docs.gradle.org/6.8.1/dsl/org.gradle.api.artifacts.Configuration.html#org.gradle.api.artifacts.Configuration:extendsFrom(org.gradle.api.artifacts.Configuration[]) for more details. at kayenta_graphite_1x9iez1l2pvtbue1zqbkhdpai$_run_closure9.doCall(/kayenta/kayenta-graphite/kayenta-graphite.gradle:177) (Run with --stacktrace to get the full stack trace of this deprecation warning.) > Configure project :kayenta-signalfx Adding a Configuration as a dependency is a confusing behavior which isn't recommended. This behaviour has been deprecated and is scheduled to be removed in Gradle 8.0. If you're interested in inheriting the dependencies from the Configuration you are adding, you should use Configuration#extendsFrom instead. See https://docs.gradle.org/6.8.1/dsl/org.gradle.api.artifacts.Configuration.html#org.gradle.api.artifacts.Configuration:extendsFrom(org.gradle.api.artifacts.Configuration[]) for more details. at kayenta_signalfx_2dzxi188pne1dhhtc7zkfa5wn$_run_closure7.doCall(/kayenta/kayenta-signalfx/kayenta-signalfx.gradle:119) (Run with --stacktrace to get the full stack trace of this deprecation warning.) ``` Replaced with Configuration#extendsFrom.

Co-authored-by: root <root@c4a3f8fec9ac>

Co-authored-by: root <root@dd6eae37ba45>

Co-authored-by: root <root@4689353c0091>

Co-authored-by: root <root@117fc153e271>

…RDERING_V2) for gradle dependencies (spinnaker#971) With gradle 6.x, used [feature preview API](https://docs.gradle.org/7.6.1/userguide/feature_lifecycle.html#feature_preview) to take advantage of [improvised dependency version ordering](https://docs.gradle.org/6.5/release-notes.html#improved-dependency-version-ordering). This feature is made public for gradle 7.x. So, removing it from settings.gradle as we moved to gradle 7.6.1

Co-authored-by: root <root@fa12a2dcfdcb>

Co-authored-by: root <root@059f8d0b8106>

…fitError catch blocks (spinnaker#972) * add spinnakerRetrofitErrorHandler and replace RetrofitError catch blocks with SpinnakerServerException, etc * feat(exceptions): add spinnakerRetrofitErrorHandler and replace RetrofitError catch blocks with SpinnakerServerException, etc * revert reduction in functionality for SignalFxMetricsService + other minor changes * feat(exceptions): replace retrofit error in kayenta-signalfx * fix format violations * fix failing tests and add missing cause for IllegalArgumentException in ConfigBinStorageService.java * kayenta-core format fixes * catch SpinnakerServerException instead of both SpinnakerNetworkException and SpinnakerHttpException --------- Co-authored-by: abe garcia <[email protected]> Co-authored-by: Cameron Motevasselani <[email protected]>

* Fixed Parameterized Tests in kayenta-blobs * Junit4 to Junit5 Migration Code Changes --------- Co-authored-by: aman-agrawal <9412470@gmail,com>

… changes for githubWorkFlow and Dockerfile.

aman-agrawal

LGTM

…3.x' into feature/OP-22224-OES-upgrade-1.33.x # Conflicts: # build.gradle # settings.gradle

j-sandy

Few minor changes required. Rest LGTM !

j-sandy · 2024-07-04T15:51:19Z

kayenta-blobs/kayenta-blobs.gradle

@@ -4,7 +4,9 @@ dependencies {

    api 'com.microsoft.azure:azure-storage:8.3.0'
    testImplementation group: 'org.mockito', name: 'mockito-core', version: '1.9.10'
-    testImplementation group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.13.1'
+}
+test {


Duplicate code.

j-sandy · 2024-07-04T15:52:10Z

kayenta-atlas/kayenta-atlas.gradle

+
+  implementation "io.spinnaker.kork:kork-retrofit"
+}
+test {


Duplicate code.

j-sandy · 2024-07-04T16:10:37Z

.../src/test/groovy/com/netflix/kayenta/security/MapBackedAccountCredentialsRepositoryTest.java

@@ -20,12 +20,12 @@
 import static com.netflix.kayenta.security.AccountCredentials.Type.METRICS_STORE;
 import static com.netflix.kayenta.security.AccountCredentials.Type.OBJECT_STORE;
 import static com.netflix.kayenta.security.AccountCredentials.Type.REMOTE_JUDGE;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.*;


Import specific package instead of *.

j-sandy · 2024-07-04T16:10:58Z

kayenta-datadog/kayenta-datadog.gradle

-  testImplementation group: 'org.mock-server', name: 'mockserver-junit-rule', version: '5.10.0'
+  testImplementation "org.mock-server:mockserver-junit-jupiter:5.15.0"
+}
+test {


Duplicate code.

j-sandy · 2024-07-04T16:18:30Z

kayenta-prometheus/kayenta-prometheus.gradle

-  testImplementation 'org.mock-server:mockserver-junit-rule:5.11.1'
+  testImplementation "org.mock-server:mockserver-junit-jupiter:5.15.0"
+}
+test {


Duplicate code.

j-sandy and others added 30 commits February 21, 2023 17:10

chore(dependencies): remove dependency on groovy-all in kayenta (spin…

5613331

…naker#930)

chore(dependencies): Autobump orcaVersion (spinnaker#931)

e5c77b5

Co-authored-by: root <root@d02b16e0674c>

chore(dependencies): Autobump orcaVersion (spinnaker#932)

00b404a

Co-authored-by: root <root@1b307cefe88f>

chore(dependencies): Autobump orcaVersion (spinnaker#941)

9d9dea0

Co-authored-by: root <root@3cb4e1a6c2a0>

chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#945)

d7e30f8

Co-authored-by: root <root@09edb544a130>

chore(gha): update to docker/login-action@v2 to stay up to date (spin…

cb57cb2

…naker#946) similar to spinnaker/fiat#1036

chore(dependencies): Autobump orcaVersion (spinnaker#947)

c64ad49

Co-authored-by: root <root@f274a1e40998>

feat(gha): configure dependabot to keep github actions up to date (sp…

6c20848

…innaker#948) see spinnaker/spin@7fa1646

chore(gha): replace action for creating github releases (spinnaker#954)

9882edb

see spinnaker/rosco#966 for background

fix(signalfx): Fixed metric type missing due to duplicated field from…

179492b

… parent class (spinnaker#957)

feat: Add API endpoint to remove account credentials by account name(…

ca455ad

…id) (spinnaker#939) Co-authored-by: Mark Rampton <[email protected]>

chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#960)

dc1b013

Co-authored-by: root <root@daa08b560ddd>

chore(dependencies): Autobump orcaVersion (spinnaker#966)

4bcf58c

Co-authored-by: root <root@c4a3f8fec9ac>

chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#968)

0ee7eb6

Co-authored-by: root <root@dd6eae37ba45>

chore(build): upgrade gradle to 7.6.1 (spinnaker#967)

6c979c2

chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#969)

999c8cf

Co-authored-by: root <root@4689353c0091>

chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#970)

f6c68ee

Co-authored-by: root <root@117fc153e271>

chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#973)

fa21a34

Co-authored-by: root <root@fa12a2dcfdcb>

chore(dependencies): Autobump orcaVersion (spinnaker#974)

c2fb63f

Co-authored-by: root <root@059f8d0b8106>

yugaa22 and others added 18 commits May 31, 2024 10:38

Update build.gradle

7deb80c

Update kayenta-oes.yml

7c55811

Update Preserve-commits.yml

792c21b

Update kayenta-oes.yml

81850b2

Update kayenta-oes.yml

186f1c6

Junit4 to Junit5 Code Changes (#12)

defbc4f

* Fixed Parameterized Tests in kayenta-blobs * Junit4 to Junit5 Migration Code Changes --------- Co-authored-by: aman-agrawal <9412470@gmail,com>

Create kayenta-oes-branch.yml

dda1f7d

armory plugin config

a37f892

Made change in PrometheusHealthIndicatorTest class

06a42dd

fix for CVE-2022-46751

c29b179

fix for CVE-2022-46751

0ae4508

Update kayenta-oes.yml

d1048a1

Update Dockerfile-fips

42f3d74

OP-21877 Upgraded signalfx-java version

a2eebe0

OP-22001 Added Auto Configurations as per SpringBoot3

02de0cd

OP-21802 : Springfox to Springdoc Update

9017834

OP-22224: Rebased with OSS-1.33.2 over the OES-1.30.1 base. Committed…

80a6cff

… changes for githubWorkFlow and Dockerfile.

Merge branch 'OES-1.33.x' into feature/OP-22224-OES-upgrade-1.33.x

cd1008e

emanipravallika requested review from aman-agrawal, j-sandy, sanopsmx and rahul-chekuri June 5, 2024 09:38

aman-agrawal changed the title ~~Upgrading Igor-oes from OES-1.30.X to OES-1.33.X~~ Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X Jun 5, 2024

aman-agrawal approved these changes Jun 5, 2024

View reviewed changes

emanipravallika and others added 3 commits June 24, 2024 18:40

Merge branch 'OES-1.33.x' into feature/OP-22224-OES-upgrade-1.33.x

fc00dda

OP-22224: updated the nexus url

0647a3c

Merge remote-tracking branch 'origin/feature/OP-22224-OES-upgrade-1.3…

312e26e

…3.x' into feature/OP-22224-OES-upgrade-1.33.x # Conflicts: # build.gradle # settings.gradle

emanipravallika merged commit 6040ae6 into OES-1.33.x Jun 24, 2024

j-sandy reviewed Jul 4, 2024

View reviewed changes

emanipravallika mentioned this pull request Jul 5, 2024

OP-22224: Addressed comments. Removed duplicate code. #23

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X #21

Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X #21

emanipravallika commented Jun 5, 2024

aman-agrawal left a comment

j-sandy left a comment

j-sandy Jul 4, 2024

j-sandy Jul 4, 2024

j-sandy Jul 4, 2024

j-sandy Jul 4, 2024

j-sandy Jul 4, 2024

Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X #21

Upgrading kayenta-oes from OES-1.30.X to OES-1.33.X #21

Conversation

emanipravallika commented Jun 5, 2024

aman-agrawal left a comment

Choose a reason for hiding this comment

j-sandy left a comment

Choose a reason for hiding this comment

j-sandy Jul 4, 2024

Choose a reason for hiding this comment

j-sandy Jul 4, 2024

Choose a reason for hiding this comment

j-sandy Jul 4, 2024

Choose a reason for hiding this comment

j-sandy Jul 4, 2024

Choose a reason for hiding this comment

j-sandy Jul 4, 2024

Choose a reason for hiding this comment