- Added missing newlines at the end of several scripts and YAML files to adhere to best practices.

- Updated various shell commands and YAML configurations for improved readability and consistency.
- Ensured proper formatting in multiple files, including deployment scripts and task definitions.

Signed-off-by: Gustavo Lira <[email protected]>

Author: gustavolira

.ibm/orchestrator-infra/README.md

@@ -1,6 +1,7 @@
 # Orchestrator Infrastructure Only
 
-This project deploys the complete infrastructure needed for the Orchestrator plugin without RHDH/Backstage. It includes all the supporting services required for workflow orchestration.
+This project deploys the complete infrastructure needed for the Orchestrator plugin without
+RHDH/Backstage. It includes all the supporting services required for workflow orchestration.
 
 ## Components
 
@@ -191,7 +192,7 @@ oc logs -l app=sonataflow-platform-data-index-service -n orchestrator-infra
 ```bash
 # Check workflow status
 oc get sonataflow -n orchestrator-infra
-oc describe sonataflow <workflow-name> -n orchestrator-infra
+oc describe sonataflow orchestrator-infra < workflow-name > -n
 ```
 
 ## Uninstall
@@ -210,6 +211,7 @@ oc delete application orchestrator-infra -n openshift-gitops
 ## Support
 
 For issues or questions:
+
 - Check the logs: `oc logs -n orchestrator-infra <pod-name>`
 - Review events: `oc get events -n orchestrator-infra`
 - Consult the [Orchestrator documentation](https://github.com/parodos-dev/orchestrator-helm-chart)

.ibm/orchestrator-infra/deploy-orchestrator.sh

@@ -27,7 +27,7 @@ warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
 info() { echo -e "${BLUE}[INFO]${NC} $*"; }
 
 print_help() {
-  cat <<EOF
+  cat << EOF
 Usage: $(basename "$0") [OPTIONS]
 
 Deploy Orchestrator Infrastructure without RHDH/Backstage
@@ -97,7 +97,7 @@ while [[ $# -gt 0 ]]; do
       DRY_RUN="true"
       shift
       ;;
-    -h|--help)
+    -h | --help)
       print_help
       exit 0
       ;;
@@ -112,30 +112,30 @@ done
 # Check prerequisites
 log "Checking prerequisites..."
 
-if ! command -v oc >/dev/null 2>&1; then
+if ! command -v oc > /dev/null 2>&1; then
   error "oc CLI not installed. Please install OpenShift CLI."
   exit 1
 fi
 
-if ! command -v ansible-playbook >/dev/null 2>&1; then
+if ! command -v ansible-playbook > /dev/null 2>&1; then
   error "ansible-playbook not installed. Please install Ansible."
   exit 1
 fi
 
-if ! oc whoami >/dev/null 2>&1; then
+if ! oc whoami > /dev/null 2>&1; then
   error "Not logged into OpenShift. Please run 'oc login' first."
   exit 1
 fi
 
-info "Cluster: $(oc whoami --show-console 2>/dev/null || echo "unknown")"
+info "Cluster: $(oc whoami --show-console 2> /dev/null || echo "unknown")"
 info "User: $(oc whoami)"
 
 # Check Python kubernetes library
-if ! python3 -c "import kubernetes" 2>/dev/null; then
+if ! python3 -c "import kubernetes" 2> /dev/null; then
   warn "Python kubernetes library not installed. Installing..."
-  pip3 install kubernetes --user --break-system-packages 2>/dev/null || \
-    pip3 install kubernetes --user 2>/dev/null || \
-    error "Failed to install kubernetes library. Please install manually: pip3 install kubernetes"
+  pip3 install kubernetes --user --break-system-packages 2> /dev/null \
+    || pip3 install kubernetes --user 2> /dev/null \
+    || error "Failed to install kubernetes library. Please install manually: pip3 install kubernetes"
 fi
 
 if [ "$DRY_RUN" = "true" ]; then
@@ -156,11 +156,11 @@ fi
 # Clean namespace if requested
 if [ "$CLEAN" = "true" ]; then
   log "Cleaning namespace $NAMESPACE..."
-  oc delete namespace "$NAMESPACE" --ignore-not-found --wait=false 2>/dev/null || true
-  
+  oc delete namespace "$NAMESPACE" --ignore-not-found --wait=false 2> /dev/null || true
+
   # Wait for namespace deletion
   for _ in {1..30}; do
-    if ! oc get namespace "$NAMESPACE" >/dev/null 2>&1; then
+    if ! oc get namespace "$NAMESPACE" > /dev/null 2>&1; then
       break
     fi
     echo -n "."
@@ -212,4 +212,4 @@ else
   error "Deployment failed with code: $RET"
   error "Check the logs above for details"
   exit $RET
-fi
+fi

.ibm/orchestrator-infra/deploy.yml

@@ -18,17 +18,17 @@
 
     # Install Orchestrator infrastructure
     install_orchestrator_infra: true
-    
+
     # Keycloak
     deploy_keycloak: true
     rhdh_keycloak_auth: true
-    
+
     # GitOps (optional)
     enable_gitops: "{{ enable_gitops | default(false) }}"
 
     # Backend secret
     backstage_backend_auth_secret: "orchestrator123"
-    
+
   tasks:
     - name: Display deployment configuration
       debug:
@@ -143,4 +143,4 @@
           - "  1. Check pods: oc get pods -n {{ rhdh_ns }}"
           - "  2. Configure your RHDH/Backstage instance with the endpoints above"
           - "  3. Add Orchestrator plugins to your Backstage dynamic-plugins"
-          - "=========================================================="
+          - "=========================================================="

.ibm/orchestrator-infra/orchestrator-infra-playbook.yml

@@ -12,33 +12,33 @@
 
     # Use original project defaults but override the namespace
     rhdh_ns: "{{ orchestrator_namespace }}"
-    
+
     # Keycloak configuration
     deploy_keycloak: true
     rhdh_keycloak_auth: true
     rhdh_keycloak_client_id: "orchestrator"
     rhdh_keycloak_client_secret: "orchestrator-secret"
     rhdh_keycloak_realm: "orchestrator"
-    
+
     # PostgreSQL for Orchestrator
     orchestrator_db_name: "backstage_plugin_orchestrator"
 
     # Install only orchestrator infrastructure (not RHDH)
     install_orchestrator_infra: true
-    
+
     # Deploy directory
     rhdh_deploy_dir: "/tmp/orchestrator-infra-deploy"
     rhdh_config_dir: "{{ rhdh_deploy_dir }}/config"
-    
+
     # Serverless Logic Operator
     install_serverless_operator: true
-    
+
     # GitOps (optional)
     enable_gitops: false
-    
+
     # Workflow samples
     workflow_repo: "https://github.com/rhdh-orchestrator-test/serverless-workflows.git"
-    
+
   tasks:
     - name: Verify OpenShift connection
       kubernetes.core.k8s_info:
@@ -105,40 +105,40 @@
                       app: postgresql-orchestrator
                   spec:
                     containers:
-                    - name: postgresql
-                      image: registry.redhat.io/rhel9/postgresql-15:latest
-                      env:
-                      - name: POSTGRESQL_USER
-                        valueFrom:
-                          secretKeyRef:
-                            name: postgresql-orchestrator-secret
-                            key: database-user
-                      - name: POSTGRESQL_PASSWORD
-                        valueFrom:
-                          secretKeyRef:
-                            name: postgresql-orchestrator-secret
-                            key: database-password
-                      - name: POSTGRESQL_DATABASE
-                        valueFrom:
-                          secretKeyRef:
-                            name: postgresql-orchestrator-secret
-                            key: database-name
-                      - name: POSTGRESQL_MAX_CONNECTIONS
-                        value: "200"
-                      ports:
-                      - containerPort: 5432
-                        name: postgresql
-                      volumeMounts:
-                      - name: postgresql-data
-                        mountPath: /var/lib/pgsql/data
+                      - name: postgresql
+                        image: registry.redhat.io/rhel9/postgresql-15:latest
+                        env:
+                          - name: POSTGRESQL_USER
+                            valueFrom:
+                              secretKeyRef:
+                                name: postgresql-orchestrator-secret
+                                key: database-user
+                          - name: POSTGRESQL_PASSWORD
+                            valueFrom:
+                              secretKeyRef:
+                                name: postgresql-orchestrator-secret
+                                key: database-password
+                          - name: POSTGRESQL_DATABASE
+                            valueFrom:
+                              secretKeyRef:
+                                name: postgresql-orchestrator-secret
+                                key: database-name
+                          - name: POSTGRESQL_MAX_CONNECTIONS
+                            value: "200"
+                        ports:
+                          - containerPort: 5432
+                            name: postgresql
+                        volumeMounts:
+                          - name: postgresql-data
+                            mountPath: /var/lib/pgsql/data
                 volumeClaimTemplates:
-                - metadata:
-                    name: postgresql-data
-                  spec:
-                    accessModes: [ "ReadWriteOnce" ]
-                    resources:
-                      requests:
-                        storage: 5Gi
+                  - metadata:
+                      name: postgresql-data
+                    spec:
+                      accessModes: ["ReadWriteOnce"]
+                      resources:
+                        requests:
+                          storage: 5Gi
 
         - name: Create PostgreSQL Service
           kubernetes.core.k8s:
@@ -151,8 +151,8 @@
                 namespace: "{{ orchestrator_namespace }}"
               spec:
                 ports:
-                - port: 5432
-                  targetPort: 5432
+                  - port: 5432
+                    targetPort: 5432
                 selector:
                   app: postgresql-orchestrator
                 type: ClusterIP
@@ -259,8 +259,8 @@
           spec:
             flow:
               id: "{{ item.name }}"
-              version: '1.0'
-              specVersion: '0.8'
+              version: "1.0"
+              specVersion: "0.8"
               name: "{{ item.description }}"
               start: Start
               states:
@@ -271,7 +271,10 @@
                   end: true
       loop:
         - { name: "user-onboarding", description: "User Onboarding Workflow" }
-        - { name: "infrastructure-provisioning", description: "Infrastructure Provisioning Workflow" }
+        - {
+            name: "infrastructure-provisioning",
+            description: "Infrastructure Provisioning Workflow",
+          }
       when: install_orchestrator_infra | bool
 
     # GitOps configuration (optional)
@@ -336,4 +339,4 @@
           - ""
           - "Check pods status:"
           - "  oc get pods -n {{ orchestrator_namespace }}"
-          - "========================================================"
+          - "========================================================"

.ibm/orchestrator-infra/orchestrator-plugin-help.md

@@ -1,28 +1,30 @@
 # :wave: Need help enabling **Orchestrator** plugins on RHDH
 
-*Chart / Image*
+_Chart / Image_
+
 ```
 chart: quay.io/rhdh/chart 1.7-154-CI
 image: quay.io/redhat-developer-hub/rhdh-hub-rhel9:1.7-154-CI
 namespace: rhdh-ci
 ```
 
-*What I tried*
+_What I tried_
+
 1. `@redhat/[email protected]` + integrity → npm 404
-2. Path to dist dir `./dynamic-plugins/dist/backstage-plugin-orchestrator` → ENOENT (no package.json)
-3. Path to tgz `./dynamic-plugins/dist/backstage-plugin-orchestrator-backend-dynamic-1.7.1.tgz` → tarball corrupted / ENOENT
+2. Path to dist dir `./dynamic-plugins/dist/backstage-plugin-orchestrator` → ENOENT (no
+   package.json)
+3. Path to tgz `./dynamic-plugins/dist/backstage-plugin-orchestrator-backend-dynamic-1.7.1.tgz` →
+   tarball corrupted / ENOENT
 4. Combos of the above (with/without integrity) → same errors
 
 Installer always ends with:
+
 ```text
 Error while installing plugin … with 'npm pack'
 npm error enoent Could not read package.json …
 ```
 
-Anyone know the correct reference for the Orchestrator tarballs **in this image** or a flag to skip `npm pack`?
+Anyone know the correct reference for the Orchestrator tarballs **in this image** or a flag to skip
+`npm pack`?
 
 Thanks! :pray:
-
-
-
-

.ibm/orchestrator-infra/rhdh-orchestrator-config.yaml

@@ -85,4 +85,4 @@ data:
       # Scaffolder Module for Orchestrator
       - package: https://npm.stage.registry.redhat.com/@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic/-/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic-1.7.1-rc.1.tgz
         integrity: sha512-qeOiYBn7XzT39q1w/86wSeuTPD50IJSZlBI2iSNy8k5hmqaIxZ9OWIEaT1QPgfSbeniYxmYGQZiyZWdMNXscIA==
-        disabled: false
+        disabled: false

.ibm/orchestrator-infra/roles/deploy-cost-metrics-operator/defaults/main.yml

@@ -14,4 +14,4 @@ costmetrics_label_namespaces:
   - rhdh
   - sonataflow-infra
   - rhdh-operator
-  - costmanagement-metrics-operator 
+  - costmanagement-metrics-operator

.ibm/orchestrator-infra/roles/deploy-cost-metrics-operator/tasks/create_costmanagement_resource.yml

@@ -5,4 +5,4 @@
   ansible.builtin.shell: |
     cat << EOF | oc apply -f -
     {{ lookup('template', 'costmanagement_resource.yaml.j2') }}
-    EOF 
+    EOF

.ibm/orchestrator-infra/roles/deploy-cost-metrics-operator/tasks/create_secret.yml

@@ -5,4 +5,4 @@
   ansible.builtin.shell: |
     cat << EOF | oc apply -f -
     {{ lookup('template', 'costmanagement_secret.yaml.j2') }}
-    EOF 
+    EOF

.ibm/orchestrator-infra/roles/deploy-cost-metrics-operator/tasks/install_operator.yml

@@ -25,4 +25,4 @@
       name: "{{ costmetrics_operator_name }}"
       source: "{{ costmetrics_operator_source }}"
       sourceNamespace: "{{ costmetrics_operator_source_namespace }}"
-    EOF 
+    EOF