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

Jump to bottom

Fixes #23806: Add Amazon Linux in the technique editor conditions #5214

Draft
wants to merge 1 commit into
base: branches/rudder/8.0
Choose a base branch
from
+22 −6
Draft

Fixes #23806: Add Amazon Linux in the technique editor conditions #5214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/MethodConditions.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ type alias Condition =
, advanced : String
}

type AmazonLinuxVersion = Two | TwentyThree

showAmazonLinuxVersion: AmazonLinuxVersion -> String
showAmazonLinuxVersion v =
case v of
Two -> "2"
TwentyThree -> "23"

type UbuntuMinor = All | Ten | ZeroFour

Expand All @@ -46,7 +53,7 @@ type LinuxOS = DebianFamily
| Rocky { major : Maybe Int, minor : Maybe Int }
| Oracle { major : Maybe Int, minor : Maybe Int }
| Fedora { version : Maybe Int }
| Amazon
| Amazon { version : Maybe AmazonLinuxVersion }
| SuseFamily
| SLES { version : Maybe Int, sp : Maybe Int }
| SLED { version : Maybe Int, sp : Maybe Int }
Expand Down Expand Up @@ -96,7 +103,7 @@ osName maybeOs =
Rocky _ -> "Rocky Linux"
Oracle _ -> "Oracle Linux"
Fedora _ -> "Fedora"
Amazon -> "Amazon Linux"
Amazon _ -> "Amazon Linux"
SuseFamily -> "SUSE family"
SLES _ -> "SLES"
SLED _ -> "SLED"
Expand All @@ -117,6 +124,12 @@ ubuntuCondition s v =
(Just major, m) -> s ++ "_" ++ (String.fromInt major) ++ "_" ++ (showUbuntuMinor m)
(Nothing, _) -> s

amazonLinuxCondition: { version : Maybe AmazonLinuxVersion } -> String
amazonLinuxCondition v =
case (v.version) of
(Just ver) -> "amzn_" ++ (showAmazonLinuxVersion ver)
(Nothing) -> "amazon_linux"

versionSPCondition: String -> { version : Maybe Int, sp : Maybe Int} -> String
versionSPCondition s v =
case (v.version, v.sp) of
Expand Down Expand Up @@ -155,7 +168,7 @@ conditionLinux os =
Rocky v -> majorMinorVersionCondition "rocky" v
Oracle v -> majorMinorVersionCondition "oracle" v
Fedora v -> Maybe.withDefault "fedora" (Maybe.map (String.fromInt >> (++) "fedora_") v.version)
Amazon -> "amazon_linux"
Amazon v -> amazonLinuxCondition v
SuseFamily -> "suse"
SLES v -> versionSPCondition "sles" v
SLED v -> versionSPCondition "sled" v
Expand Down Expand Up @@ -200,7 +213,10 @@ parseOs os =
[ "suse" ] -> Just (Linux (Just (SuseFamily)))
[ "redhat" ] -> Just (Linux (Just (RedhatFamily)))
[ "debian" ] -> Just (Linux (Just (DebianFamily)))
[ "amazon_linux" ] -> Just (Linux (Just (Amazon)))

[ "amazon", "linux" ] -> Just (Linux (Just (Amazon { version = Nothing })))
[ "amzn", "2" ] -> Just (Linux (Just (Amazon { version = Just Two })))
[ "amzn", "2023" ] -> Just (Linux (Just (Amazon { version = Just TwentyThree })))

[ "fedora" ] -> Just (Linux (Just (Fedora { version = Nothing })))
[ "fedora", major ] -> case String.toInt major of
Expand Down Expand Up @@ -350,7 +366,7 @@ osList =
, Just (Linux (Just (Rocky noVersion)))
, Just (Linux (Just (Oracle noVersion)))
, Just (Linux (Just (Fedora {version = Nothing})))
, Just (Linux (Just (Amazon)))
, Just (Linux (Just (Amazon {version = Nothing})))
, Just (Linux (Just (SuseFamily)))
, Just (Linux (Just (SLES {version = Nothing, sp = Nothing})))
, Just (Linux (Just (SLED {version = Nothing, sp = Nothing})))
Expand Down
2 changes: 1 addition & 1 deletion webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,4 +625,4 @@ callBody model ui techniqueUi call pid =
) (ui.mode == Opened)

]
]
]