mas-cli 10.3.2__py3-none-any.whl → 10.4.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "10.3.2"
+__version__ = "10.4.0"

mas/cli/install/app.py

@@ -33,6 +33,7 @@ from mas.cli.validators import (
   InstanceIDFormatValidator,
   WorkspaceIDFormatValidator,
   WorkspaceNameFormatValidator,
+  TimeoutFormatValidator,
   StorageClassValidator,
   OptimizerInstallPlanValidator
 )
@@ -51,6 +52,7 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             catalogDisplayName = catalog.spec.displayName
 
             m = re.match(r".+(?P<catalogId>v[89]-(?P<catalogVersion>[0-9]+)-amd64)", catalogDisplayName)
+            print(f"m: {m}")
             if m:
                 # catalogId = v8-yymmdd-amd64
                 # catalogVersion = yymmdd
@@ -187,6 +189,21 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
 
         self.deployCP4D = True
 
+    def configSSOProperties(self):
+        self.printH2("Configure Single Sign-On (SSO) Default Properties")
+        sso_response = self.yesOrNo("Would you like to configure default SSO properties?")
+        if not sso_response:
+            self.printDescription([
+                "Using default SSO properties"
+            ])
+        else:
+            self.promptForInt("Enter the idleTimeout (in seconds)", "idle_timeout", default=1800)
+            self.promptForString("Enter the IDP session timeout (e.g., '12h' for 12 hours)", "idp_session_timeout", validator=TimeoutFormatValidator(), default="12h")
+            self.promptForString("Enter the access token timeout (e.g., '30m' for 30 minutes)", "access_token_timeout", validator=TimeoutFormatValidator(), default="30m")
+            self.promptForString("Enter the refresh token timeout (e.g., '12h' for 12 hours)", "refresh_token_timeout", validator=TimeoutFormatValidator(), default="12h")
+            self.promptForString("Enter the default Identity Provider (IDP)", "default_idp", default="local")
+            self.yesOrNo("Enable seamless login?", param="seamless_login")
+
     def configMAS(self):
         self.printH1("Configure MAS Instance")
         self.printDescription([
@@ -513,6 +530,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         # Interactive mode
         self.interactiveMode = True
 
+        # SSO Config
+        self.configSSOProperties()
         # Catalog
         self.configCatalog()
         if not self.devMode:

mas/cli/templates/ibm-mas-tekton.yaml

@@ -108,7 +108,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -226,7 +226,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -296,7 +296,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -359,7 +359,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -454,7 +454,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -569,7 +569,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -689,7 +689,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -806,7 +806,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -912,7 +912,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1234,7 +1234,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1337,7 +1337,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1426,7 +1426,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1530,7 +1530,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1607,7 +1607,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1786,7 +1786,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1870,7 +1870,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1983,7 +1983,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2092,7 +2092,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2335,7 +2335,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2428,7 +2428,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2550,7 +2550,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2648,7 +2648,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -2740,7 +2740,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2825,7 +2825,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2910,7 +2910,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3017,7 +3017,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3105,7 +3105,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -3188,7 +3188,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -3264,7 +3264,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -3373,7 +3373,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3475,7 +3475,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -3532,7 +3532,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3725,7 +3725,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -3823,7 +3823,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3915,7 +3915,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4007,7 +4007,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4100,7 +4100,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4191,7 +4191,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4284,7 +4284,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -4387,7 +4387,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4469,7 +4469,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -4599,7 +4599,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -4695,7 +4695,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -4816,7 +4816,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4867,7 +4867,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: shared-entitlement
 
@@ -5324,7 +5324,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -5728,7 +5728,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5835,7 +5835,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -5947,7 +5947,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6064,7 +6064,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6120,7 +6120,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6287,7 +6287,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6440,7 +6440,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6546,7 +6546,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: certificates
@@ -6712,7 +6712,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6812,7 +6812,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -6936,7 +6936,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7008,7 +7008,6 @@ spec:
   steps:
     - args:
       - |-
-        set -e -o pipefail
 
         mkdir -p /tmp/init-suite-objectstorage-config
         mkdir -p /tmp/suite-objectstorage-config-dir
@@ -7038,7 +7037,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7182,7 +7181,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 
@@ -7291,7 +7290,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7388,7 +7387,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7647,7 +7646,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7697,7 +7696,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -7831,7 +7830,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -7938,7 +7937,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -8180,7 +8179,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8207,7 +8206,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -8312,7 +8311,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -8506,7 +8505,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8549,7 +8548,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -8666,7 +8665,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -8745,7 +8744,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_deprovision
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/ocp-verify-all.yaml
@@ -8777,7 +8776,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8819,7 +8818,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8861,7 +8860,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8903,7 +8902,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -8945,7 +8944,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9071,7 +9070,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -9139,7 +9138,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9320,7 +9319,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -9695,12 +9694,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -9901,7 +9900,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -9990,7 +9989,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -10053,7 +10052,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -10128,7 +10127,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -10229,7 +10228,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -10372,7 +10371,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -10439,7 +10438,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10510,7 +10509,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -10700,7 +10699,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -10796,6 +10795,25 @@ spec:
       type: string
       description: Required to install development MAS catalogs
 
+    # SSO Configuration
+    - name: idle_timeout
+      type: string
+      default: ''
+    - name: idp_session_timeout
+      type: string
+      default: ''
+    - name: access_token_timeout
+      type: string
+      default: ''
+    - name: refresh_token_timeout
+      type: string
+      default: ''
+    - name: default_idp
+      type: string
+      default: ''
+    - name: seamless_login
+      type: string
+      default: ''
   stepTemplate:
     env:
       - name: DEVOPS_MONGO_URI
@@ -10874,13 +10892,27 @@ spec:
 
       - name: MAS_POD_TEMPLATES_DIR
         value: /workspace/pod-templates
+      
+      - name: IDLE_TIMEOUT
+        value: $(params.idle_timeout)
+      - name: IDP_SESSION_TIMEOUT
+        value: $(params.idp_session_timeout)
+      - name: ACCESS_TOKEN_TIMEOUT
+        value: $(params.access_token_timeout)
+      - name: REFRESH_TOKEN_TIMEOUT
+        value: $(params.refresh_token_timeout)
+      - name: DEFAULT_IDP
+        value: $(params.default_idp)
+      - name: SEAMLESS_LOGIN
+        value: $(params.seamless_login)
+      
 
   steps:
     - name: suite-install
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -10968,7 +11000,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -11033,7 +11065,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -11103,7 +11135,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -11165,12 +11197,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set CONFIGMAP_KEY=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11299,7 +11331,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -11380,7 +11412,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -11443,7 +11475,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -11529,7 +11561,7 @@ spec:
 
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -11591,7 +11623,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -11655,7 +11687,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:10.3.2
+      image: quay.io/ibmmas/cli:10.4.0
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -11723,7 +11755,6 @@ spec:
     - name: mas_instance_id
       type: string
       default: ""
-
     - name: mas_workspace_id
       type: string
       default: ""
@@ -18618,7 +18649,6 @@ spec:
       type: string
       default: ""
 
-
     # 2. Installation
     # -------------------------------------------------------------------------
     # Storage Class Selection
@@ -19360,6 +19390,27 @@ spec:
       default: ""
       description: Data Dictionary catalog source
 
+    # SSO Configuration
+    # -----------------------------------------------------------------------------
+    - name: idle_timeout
+      type: string
+      default: ''
+    - name: idp_session_timeout
+      type: string
+      default: ''
+    - name: access_token_timeout
+      type: string
+      default: ''
+    - name: refresh_token_timeout
+      type: string
+      default: ''
+    - name: default_idp
+      type: string
+      default: ''
+    - name: seamless_login
+      type: string
+      default: ''
+
     # MAS Configuration - Superuser Account
     # -----------------------------------------------------------------------------
     - name: mas_superuser_username
@@ -20890,6 +20941,18 @@ spec:
           value: $(params.mas_icr_cpopen)
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
+        - name: idle_timeout
+          value: $(params.idle_timeout)
+        - name: idp_session_timeout
+          value: $(params.idp_session_timeout)
+        - name: access_token_timeout
+          value: $(params.access_token_timeout)
+        - name: refresh_token_timeout
+          value: $(params.refresh_token_timeout)
+        - name: default_idp
+          value: $(params.default_idp)
+        - name: seamless_login
+          value: $(params.seamless_login)
         - name: mas_manual_cert_mgmt
           value: $(params.mas_manual_cert_mgmt)
         - name: mas_trust_default_cas
@@ -23504,7 +23567,6 @@ spec:
       type: string
       default: ""
 
-
     # 2. Upgrade
     # -------------------------------------------------------------------------
     - name: skip_compatibility_check

mas/cli/validators.py

@@ -9,6 +9,7 @@
 # *****************************************************************************
 
 from re import match
+import re
 from os import path
 
 # Use of the openshift client rather than the kubernetes client allows us access to "apply"
@@ -47,6 +48,15 @@ class WorkspaceIDFormatValidator(Validator):
         if not match(r"^[a-z][a-z0-9]{2,11}$", instanceId):
             raise ValidationError(message='Workspace ID does not meet the requirements', cursor_position=len(instanceId))
 
+class TimeoutFormatValidator(Validator):
+    def validate(self, document):
+        """
+        Validate that a MAS instance ID exists on the target cluster
+        """
+        string_to_validate = document.text
+        if not match(r'^([0-9]+)([hm])$', string_to_validate):
+            message = f"Error: Your input: {string_to_validate} does not meet the required pattern. Please use it in hours or minutes format (e.g., 12h, 12m)."
+            raise ValidationError(message=message, cursor_position=len(string_to_validate))
 
 class WorkspaceNameFormatValidator(Validator):
     def validate(self, document):

{mas_cli-10.3.2.dist-info → mas_cli-10.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mas-cli
-Version: 10.3.2
+Version: 10.4.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-10.3.2.dist-info → mas_cli-10.4.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-mas/cli/__init__.py,sha256=Wt9caaWxPRSICfssuox403s2eTwyfJJH5_P51FsYhmg,491
+mas/cli/__init__.py,sha256=eNECSBqvIieLa0qm_-2VZM80EI4WTo9lA43oVZaVuHs,491
 mas/cli/cli.py,sha256=nwl6KAHyGo_JqpkJ9tYk0LP8fmiFVk0JHR2LjjqVzy8,8730
 mas/cli/displayMixins.py,sha256=nyfZP9xqrg9L0mPPxLF7nbWvpp59wo0aDHupDX2UKdQ,5493
 mas/cli/gencfg.py,sha256=57ik5x73gQBFXPl_8h2byXmV_vhCgxfeSDZk4Wg5-Pw,2102
-mas/cli/validators.py,sha256=5QwiDQn2EIqJABJyDbHGGaSvlkE38IeJ98d1Czz682A,4550
+mas/cli/validators.py,sha256=gKqLLQPvgcmIKE1OJjLNO2F34ECRXSlHJvFE-QxadIc,5086
 mas/cli/install/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
-mas/cli/install/app.py,sha256=NN3NNM8txPTNWEJymbkg5gQpINnw2g1GFLrzP2yrqwU,46431
+mas/cli/install/app.py,sha256=nejihQSr1_GCWFENEJH_qGigqU-mznT2iN6B_OhaRfw,47676
 mas/cli/install/argParser.py,sha256=Rdt72NjFsPeyaYHRL6hz5j0sL4W5lZPPrLZt2yzS_M4,23341
 mas/cli/install/summarizer.py,sha256=ydOnkiRmj3nPPcE9ZHNxHDMMgii_VYHKnyXV4JbVQ7s,18046
 mas/cli/install/settings/__init__.py,sha256=eGdNVHVALUxJlZyGYkBet8LbHvVfa-1UjL_8Zl3d-lY,953
@@ -13,7 +13,7 @@ mas/cli/install/settings/db2Settings.py,sha256=mR0XL81Talvwvm1bekw0o9VOwV42QkS0j
 mas/cli/install/settings/kafkaSettings.py,sha256=bjAji5OZfSBpttiYHKM5B5Lvva8L8PUzi8QSs6opQcE,6997
 mas/cli/install/settings/manageSettings.py,sha256=3HtyR6-DKiKQDFTWnnxAr5OmkfqKwjI4xnBaAcAjOCI,13229
 mas/cli/install/settings/turbonomicSettings.py,sha256=OC-sn6_Z6MAq0kf33OC3c96gqT8FT4P7A51PenPiCXw,1368
-mas/cli/templates/ibm-mas-tekton.yaml,sha256=iInsDvW1CyYhyIfTWEGxJWyfAtNQ-7ud_zDVxrkCMgA,734630
+mas/cli/templates/ibm-mas-tekton.yaml,sha256=VV8l9PMt4UiWBAvSAAnaOhbU3nr0n_q6DvSbo5H1kWs,736445
 mas/cli/templates/jdbccfg.yml.j2,sha256=cANbwkUkKEPQp-P3_BB_Llbt94457Ciagah2hOdySIM,1644
 mas/cli/templates/pod-templates/best-effort/ibm-data-dictionary-assetdatadictionary.yml,sha256=8VG_FDFcEjWNaAOZTcS58Pe0tWOXC10SJLloNqzEMC8,757
 mas/cli/templates/pod-templates/best-effort/ibm-mas-bascfg.yml,sha256=rkq8c2pVJoskgict9tCZzCchGSE2MBC-dJ47JyMYm7A,1559
@@ -94,8 +94,8 @@ mas/cli/update/argParser.py,sha256=k9-2i6KRvU4gxkiHJTgtjh1IkDaaLzgisrZe6-JORJA,3
 mas/cli/upgrade/__init__.py,sha256=tGH_qJ5ZqcSFpIlObRiye3Y-r4zU8rEplYFjwuHwBTY,494
 mas/cli/upgrade/app.py,sha256=lxMZYlO_sybzbOuZ4D7R0OCjGqnMg3MF1h2vSVZ1YmE,5328
 mas/cli/upgrade/argParser.py,sha256=jl8SU0mXDMAkpfqXaKE4MPNUmVoD0LSsvMUSJjU1dbQ,1881
-mas_cli-10.3.2.data/scripts/mas-cli,sha256=2fU-juOhSGp1v2NiBmAsvAaaJLFJPBp7dlflgzA9yNk,3423
-mas_cli-10.3.2.dist-info/METADATA,sha256=NfOoMMZPysaQVJoBi8D3j5-Y-uRQyF1KM6-ZB9upaqk,2076
-mas_cli-10.3.2.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-mas_cli-10.3.2.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
-mas_cli-10.3.2.dist-info/RECORD,,
+mas_cli-10.4.0.data/scripts/mas-cli,sha256=2fU-juOhSGp1v2NiBmAsvAaaJLFJPBp7dlflgzA9yNk,3423
+mas_cli-10.4.0.dist-info/METADATA,sha256=3_M60-57GD7LRQ7i6q5T2cKZKJ2jzwHaMoXSHVwcI8c,2076
+mas_cli-10.4.0.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+mas_cli-10.4.0.dist-info/top_level.txt,sha256=_Hlsp7pvMvyV14LFg-vk1hULq30j61EILnnxMFIhhc8,4
+mas_cli-10.4.0.dist-info/RECORD,,