Skip to content

Fix type warnings #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serverhorror wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix type warnings #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95a03e0
Fix type warnings
serverhorror Dec 14, 2023
7b75f5c
Make Changelog enforcer happy
serverhorror Dec 14, 2023
0b45307
Merge branch 'master' into bugfix/1061-fix-types-in-openshiftService
serverhorror Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Unreleased
* Fix type warnings in `OpenShiftService` ([#1061](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1061))
* Fix documentation refers to qs with prefix infra- however there are only inf- quickstarters ([#1060](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1060))
* Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055))
* Aqua scanner and Helm deployment conflict fix for jenkins shared library ([#1067](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1067))
Expand Down
6 changes: 3 additions & 3 deletions src/org/ods/services/OpenShiftService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ class OpenShiftService {
buildArgsItems << """{"name": "${key}", "value": "${val}"}"""
}
if (buildArgsItems.size() > 0) {
def buildArgsPatch = """{"op": "replace", "path": "/spec/strategy/dockerStrategy/buildArgs", "value": [${buildArgsItems.join(',')}]}"""
String buildArgsPatch = """{"op": "replace", "path": "/spec/strategy/dockerStrategy/buildArgs", "value": [${buildArgsItems.join(',')}]}"""
patches << buildArgsPatch
}

Expand Down Expand Up @@ -488,7 +488,7 @@ class OpenShiftService {
// - repository (= OpenShift project in case of image from ImageStream)
// - name (= ImageStream name in case of image from ImageStream)
Map<String, String> imageInfoForImageUrl(String url) {
def imageInfo = [:]
Map <String,String> imageInfo = [:]
def urlParts = url.split('/').toList()

if (urlParts.size() < 2) {
Expand Down Expand Up @@ -1383,7 +1383,7 @@ class OpenShiftService {
}

private Map<String, String> imageInfoWithSha(List<String> urlParts) {
def imageInfo = [:]
Map<String,String> imageInfo = [:]
def url = urlParts.join('/')
if (urlParts.size() < 2 || !urlParts[-1].contains('@sha256:')) {
throw new RuntimeException(
Expand Down