Skip to content
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

Bump OPA version from v0.68.0 to v0.69.0 and Set new accepted minimum to v0.69.0 #1348

Merged
merged 6 commits into from
Oct 3, 2024
+9 −5
Merged

Bump OPA version from v0.68.0 to v0.69.0 and Set new accepted minimum to v0.69.0 #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c9a8b3
Bump OPA version from v0.68.0 to v0.69.0
actions-user Oct 1, 2024
844f990
make v0.69.0 the minimum version
buidav Oct 1, 2024
12224cb
update workflow to handle single version case
buidav Oct 2, 2024
7832f5a
fix spacing
buidav Oct 2, 2024
db26b51
* Fix error message printing acceptable OPA versions
schrolla Oct 2, 2024
9ee9bfc
rm extra space in the workflow
buidav Oct 2, 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
6 changes: 6 additions & 0 deletions .github/workflows/run_update_opa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ jobs:
($VersionsArr[0..($VersionsArr.Length-2)] -join ",") + ","
" '$CurrentOPAVersion', $DefaultOPAVersionVar $END_VERSIONS_COMMENT" # 4 space indentation
}
elseif ($VersionsLength -eq 1) {
# if the default version is the only acceptable version
# Make `VariableName = CurrentVersion, DefaultOPAVer #EndVersionComment `
$VersionsArr = $_ -split "="
$VersionsArr[0] + "= '$CurrentOPAVersion'" + ", $DefaultOPAVersionVar $END_VERSIONS_COMMENT"
}
else {
# No Splitting lines; Appending new Current OPA version to acceptable version
$VersionsArr = $_ -split ","
Expand Down
2 changes: 1 addition & 1 deletion PowerShell/ScubaGear/Modules/ScubaConfig/ScubaConfig.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ScubaConfig {
"Hybrid Identity Administrator",
"Application Administrator",
"Cloud Application Administrator")
DefaultOPAVersion = '0.68.0'
DefaultOPAVersion = '0.69.0'
}

static [object]ScubaDefault ([string]$Name){
Expand Down
6 changes: 2 additions & 4 deletions PowerShell/ScubaGear/Modules/Support/Support.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,7 @@ function Install-OPAforSCuBA {
)

# Constants
$ACCEPTABLEVERSIONS = '0.59.0', '0.60.0', '0.61.0',
'0.62.1', '0.63.0', '0.64.1',
'0.65.0', '0.66.0', '0.67.1', [ScubaConfig]::ScubaDefault('DefaultOPAVersion') # End Versions
$ACCEPTABLEVERSIONS = [ScubaConfig]::ScubaDefault('DefaultOPAVersion') # End Versions
$FILENAME = @{ Windows = "opa_windows_amd64.exe"; MacOS = "opa_darwin_amd64"; Linux = "opa_linux_amd64_static"}

# Set prefernces for writing messages
Expand All @@ -266,7 +264,7 @@ function Install-OPAforSCuBA {
}

if(-not $ACCEPTABLEVERSIONS.Contains($ExpectedVersion)) {
$AcceptableVersionsString = $ACCETABLEVERSIONS -join "`r`n" | Out-String
$AcceptableVersionsString = $ACCEPTABLEVERSIONS -join "`r`n" | Out-String
throw "Version parameter entered, ${ExpectedVersion}, is not in the list of acceptable versions. Acceptable versions are:`r`n${AcceptableVersionsString}"
}

Expand Down
Loading