Merge pull request #99 from vasu2856/main

Replacing hardcoded accountIDs and updating the documentation example…

Author: abaror75

experimental/SMUS-CICD-pipeline-cli/docs/cli-commands.md

@@ -983,19 +983,19 @@ All commands support:
 smus-cli create -o my-manifest.yaml
 
 # 2. Validate configuration
-smus-cli describe -p my-manifest.yaml
+smus-cli describe --manifest my-manifest.yaml
 
 # 3. Create bundle from dev
-smus-cli bundle -p my-manifest.yaml -t dev
+smus-cli bundle --manifest my-manifest.yaml --target dev
 
 # 4. Deploy to test
-smus-cli deploy -p my-manifest.yaml -t test
+smus-cli deploy --manifest my-manifest.yaml --targets test
 
 # 5. Monitor deployment
-smus-cli monitor -p my-manifest.yaml -t test
+smus-cli monitor --manifest my-manifest.yaml --targets test
 
 # 6. Run workflow commands
-smus-cli run -w my_dag -c "dags list" -t test
+smus-cli run --workflow my_dag --command "dags list" --targets test
 ```
 
 ### Cleanup Workflow

experimental/SMUS-CICD-pipeline-cli/docs/getting-started/admin-quickstart.md

@@ -490,10 +490,10 @@ my-organization/
 ```bash
 # Both applications deploy to the same shared projects
 cd monthly-metrics
-smus-cli deploy --stages test --manifest manifest.yaml  # → shared-data-platform-test
+smus-cli deploy --targets test --manifest manifest.yaml  # → shared-data-platform-test
 
 cd ../churn-model
-smus-cli deploy --stages test --manifest manifest.yaml  # → shared-data-platform-test
+smus-cli deploy --targets test --manifest manifest.yaml  # → shared-data-platform-test
 ```
 
 All workflows from both applications appear in the same MWAA environment.

experimental/SMUS-CICD-pipeline-cli/docs/q-cli-conversation-examples.md

@@ -121,18 +121,18 @@ jobs:
       
       - name: Deploy to Dev
         if: github.ref == 'refs/heads/main'
-        run: smus-cli deploy -p manifest.yaml -t dev
+        run: smus-cli deploy --manifest manifest.yaml --targets dev
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       
       - name: Deploy to Test
         if: github.ref == 'refs/heads/main'
-        run: smus-cli deploy -p manifest.yaml -t test
+        run: smus-cli deploy --manifest manifest.yaml --targets test
       
       - name: Deploy to Prod (Manual Approval)
         if: github.event_name == 'workflow_dispatch'
-        run: smus-cli deploy -p manifest.yaml -t prod
+        run: smus-cli deploy --manifest manifest.yaml --targets prod
 ```
 
 This workflow will:

experimental/SMUS-CICD-pipeline-cli/src/smus_cicd/cli.py

@@ -44,13 +44,19 @@ def configure_logging(output_format: str = "TEXT", log_level: str = None):
 def show_help_suggestion():
     """Show helpful suggestions for common mistakes."""
     console.print("\n[yellow]💡 Common usage patterns:[/yellow]")
-    console.print("   [cyan]smus-cli describe -p my-pipeline.yaml -t dev[/cyan]")
-    console.print("   [cyan]smus-cli monitor -p my-pipeline.yaml --output JSON[/cyan]")
-    console.print("   [cyan]smus-cli deploy -p my-pipeline.yaml -t prod[/cyan]")
+    console.print(
+        "   [cyan]smus-cli describe --manifest my-pipeline.yaml --targets dev[/cyan]"
+    )
+    console.print(
+        "   [cyan]smus-cli monitor --manifest my-pipeline.yaml --output JSON[/cyan]"
+    )
+    console.print(
+        "   [cyan]smus-cli deploy --manifest my-pipeline.yaml --targets prod[/cyan]"
+    )
 
     console.print("\n[yellow]🔧 Universal switches (work on all commands):[/yellow]")
     console.print("   [green]--manifest/-m[/green]   - Path to bundle manifest")
-    console.print("   [green]--target/-t[/green]     - Target environment")
+    console.print("   [green]--targets/-t[/green]    - Target environment(s)")
     console.print("   [green]--output[/green]        - Output format (TEXT/JSON)")
     console.print(
         "   [green]--log-level[/green]     - Logging level (DEBUG/INFO/WARNING/ERROR)"
@@ -91,7 +97,7 @@ def main(
 # Register commands with proper ordering
 @app.command(
     "describe",
-    help="1. Describe and validate pipeline manifest file. Example: smus-cli describe -p pipeline.yaml -t dev",
+    help="1. Describe and validate pipeline manifest file. Example: smus-cli describe --manifest pipeline.yaml --targets dev",
     rich_help_panel="Pipeline Commands",
 )
 def describe(
@@ -177,7 +183,7 @@ def bundle(
 
 @app.command(
     "deploy",
-    help="3. Deploy bundle files to target (auto-initializes if needed). Example: smus-cli deploy -p pipeline.yaml -t prod",
+    help="3. Deploy bundle files to target (auto-initializes if needed). Example: smus-cli deploy --manifest pipeline.yaml --targets prod",
     rich_help_panel="Pipeline Commands",
 )
 def deploy(
@@ -219,7 +225,7 @@ def deploy(
 
 @app.command(
     "monitor",
-    help="4. Monitor workflow status. Example: smus-cli monitor -p pipeline.yaml -t dev",
+    help="4. Monitor workflow status. Example: smus-cli monitor --manifest pipeline.yaml --targets dev",
     rich_help_panel="Pipeline Commands",
 )
 def monitor(
@@ -320,7 +326,7 @@ def logs(
 
 @app.command(
     "run",
-    help="6. Run Airflow CLI commands in target environment. Example: smus-cli run --workflow my_dag -p pipeline.yaml",
+    help="6. Run Airflow CLI commands in target environment. Example: smus-cli run --workflow my_dag --manifest pipeline.yaml",
     rich_help_panel="Pipeline Commands",
 )
 def run(

experimental/SMUS-CICD-pipeline-cli/src/smus_cicd/mcp/server.py

@@ -461,13 +461,13 @@ def _get_github_actions_template(self, project_name: str, targets: list) -> str:
             if target == "dev":
                 deploy_steps += f"""      - name: Deploy to {target}
         if: github.ref == 'refs/heads/main'
-        run: smus-cli deploy -p bundle.yaml -t {target}
+        run: smus-cli deploy --manifest bundle.yaml --targets {target}
 
 """
             else:
                 deploy_steps += f"""      - name: Deploy to {target}
         if: github.event_name == 'workflow_dispatch'
-        run: smus-cli deploy -p bundle.yaml -t {target}
+        run: smus-cli deploy --manifest bundle.yaml --targets {target}
 
 """
 

experimental/SMUS-CICD-pipeline-cli/tests/scripts/setup/iam-based-domains/1-account-setup/stage-roles.yaml

@@ -10,12 +10,12 @@ Parameters:
   BedrockTestingPolicyArn:
     Type: String
     Description: ARN of the existing BedrockTestingPolicy managed policy
-    Default: 'arn:aws:iam::019900059033:policy/BedrockTestingPolicy'
+    Default: 'arn:aws:iam::${AWS::AccountId}:policy/BedrockTestingPolicy'
 
   BedrockAgentPassRolePolicyArn:
     Type: String
     Description: ARN of the existing BedrockAgentPassRolePolicy managed policy
-    Default: 'arn:aws:iam::019900059033:policy/BedrockAgentPassRolePolicy'
+    Default: 'arn:aws:iam::${AWS::AccountId}:policy/BedrockAgentPassRolePolicy'
 
 Resources:
   ProjectRole:

experimental/SMUS-CICD-pipeline-cli/tests/scripts/setup/iam-based-domains/4-project-setup/create_project.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: 2010-09-09
-Description: Create DataZone Project without membership handling
+Description: Create DataZone Project (basic version - role config added separately)
 
 Parameters:
   DomainId:
@@ -11,6 +11,12 @@ Parameters:
   Name:
     Description: Name of the project
     Type: String
+  ProjectRoleArn:
+    Description: Execution Role for the project
+    Type: String
+  OwnerRoleArn:
+    Description: Owner Role for the project
+    Type: String
 
 Resources:
   Project:
@@ -20,7 +26,13 @@ Resources:
       DomainIdentifier: !Ref DomainId
       Name: !Ref Name
       ProjectProfileId: !Ref ProjectProfileId
-
+      customerProvidedRoleConfigs:
+        - roleArn: !Ref ProjectRoleArn
+          roleDesignation: PROJECT_OWNER
+      membershipAssignments:
+        - designation: PROJECT_OWNER
+          member:
+            groupIdentifier: !Ref OwnerRoleArn
 Outputs:
   ProjectId:
     Description: "DataZone Project ID"