diff --git a/.github/workflows/pipeline-workflow.yml b/.github/workflows/pipeline-workflow.yml deleted file mode 100644 index cdc4749..0000000 --- a/.github/workflows/pipeline-workflow.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Pipeline Workflow - -env: - REGION: us-east-1 - -on: push - -jobs: - pipeline-job: - name: Pipeline Job - runs-on: ubuntu-latest - permissions: - id-token: write - steps: - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - role-to-assume: ${{ secrets.DISPATCHER_ROLE_ARN }} - aws-region: ${{ env.REGION }} - role-duration-seconds: 900 - role-session-name: OIDCSession - - name: Run CodeBuild - uses: aws-actions/aws-codebuild-run-build@v1 - with: - project-name: ${{ secrets.DISPATCHER_CODEBUILD_PROJECT_NAME }} diff --git a/.github/workflows/pull-request-workflow.yml b/.github/workflows/pull-request-workflow.yml deleted file mode 100644 index 477a461..0000000 --- a/.github/workflows/pull-request-workflow.yml +++ /dev/null @@ -1,22 +0,0 @@ - -name: Pull Request Workflow - -on: - pull_request: - types: [opened, edited, reopened, synchronize] - -jobs: - pull-request-job: - name: Status Checks - runs-on: ubuntu-latest - steps: - - name: Viperlight - run: | - wget -q https://viperlight-scanner.s3.amazonaws.com/latest/.viperlightrc - wget -q https://viperlight-scanner.s3.amazonaws.com/latest/viperlight.zip - unzip -q viperlight.zip -d ../viperlight - rm -r ./viperlight.zip - echo "Content scanning utility installation complete `date`" - echo "Starting content scanning `date` in `pwd`" - ../viperlight/bin/viperlight scan -m files-contents -m files-aws -m files-binary -m files-entropy -m files-secrets - echo "Completed content scanning `date`" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2529f2b..6105209 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.3] - 2022-11-10 +### Fixed +- List-Documents API call from actions.ts is failing in us-east-1. issue is resolved by adding additional filter key Owner. + ## [1.0.2] - 2021-12-31 ### Fixed - Custom Resource Lambda function failing to publish a new version of the Lambda edge function. diff --git a/README.md b/README.md index 6d40842..dd49138 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Operations Conductor +# Operations Conductor on AWS ## Description -AWS Operations Conductor is a framework that provides an easy-to-use interface for automating and orchestrating operational tasks to manage AWS resources at scale. +Operations Conductor on AWS is a framework that provides an easy-to-use interface for automating and orchestrating operational tasks to manage AWS resources at scale. ## Running unit tests for customization * Clone the repository, then make the desired code changes. ```bash -git clone https://github.com/awslabs/operations-conductor.git +git clone https://github.com/aws-solutions/operations-conductor.git cd operations-conductor export OPS_CO_PATH=`pwd` ``` @@ -47,15 +47,14 @@ aws s3 cp $OPS_CO_PATH/deployment/regional-s3-assets/ s3://$DIST_OUTPUT_BUCKET-$ * Deploy the Operations Conductor solution to your account by launching a new AWS CloudFormation stack using the link of the operations-conductor.template. ## Collection of operational metrics -This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/operations-conductor/appendix-f.html). +This solution collects anonymous operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/operations-conductor/welcome.html). *** -Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/LICENSE-2.0 -or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - +or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. \ No newline at end of file diff --git a/buildspec.yml b/buildspec.yml deleted file mode 100644 index 58d42ad..0000000 --- a/buildspec.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: 0.2 - -phases: - install: - runtime-versions: - nodejs: 14 - pre_build: - commands: - - echo "Installing dependencies and executing unit tests - `pwd`" - - cd deployment && chmod +x ./run-unit-tests.sh && ./run-unit-tests.sh - - echo "Installing dependencies and executing unit tests completed `date`" - build: - commands: - - echo "Starting build `date` in `pwd`" - - chmod +x ./build-s3-dist.sh && ./build-s3-dist.sh $DIST_OUTPUT_BUCKET $SOLUTION_NAME $VERSION - - echo "Build completed `date`" - - echo "Starting open-source-dist `date` in `pwd`" - - chmod +x ./build-open-source-dist.sh && ./build-open-source-dist.sh $SOLUTION_NAME - - echo "Open Source Dist completed `date`" - post_build: - commands: - - echo "Retrieving next stage buildspec `date` in `pwd`" - - aws s3 cp s3://solutions-build-assets/changelog-spec.yml ../buildspec.yml - - echo "Retrieving next stage buildspec complete" - - echo "Post build completed on `date`" - -artifacts: - files: - - deployment/**/* - - source/**/* - - .gitignore - - sonar-project.properties - - CHANGELOG.md - - buildspec.yml diff --git a/deployment/build-open-source-dist.sh b/deployment/build-open-source-dist.sh deleted file mode 100644 index 4b0a8b2..0000000 --- a/deployment/build-open-source-dist.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash -# -# This assumes all of the OS-level configuration has been completed and git repo has already been cloned -# -# This script should be run from the repo's deployment directory -# cd deployment -# ./build-open-source-dist.sh solution-name -# -# Parameters: -# - solution-name: name of the solution for consistency - -# Check to see if input has been provided: -if [ -z "$1" ]; then - echo "Please provide the trademark approved solution name for the open source package." - echo "For example: ./build-open-source-dist trademarked-solution-name" - exit 1 -fi - -# Get reference for all important folders -source_template_dir="$PWD" -dist_dir="$source_template_dir/open-source" -dist_template_dir="$dist_dir/deployment" -source_dir="$source_template_dir/../source" - -echo "------------------------------------------------------------------------------" -echo "[Init] Clean old open-source folder" -echo "------------------------------------------------------------------------------" -echo "rm -rf $dist_dir" -rm -rf $dist_dir -echo "mkdir -p $dist_dir" -mkdir -p $dist_dir -echo "mkdir -p $dist_template_dir" -mkdir -p $dist_template_dir - -echo "------------------------------------------------------------------------------" -echo "[Packing] Templates" -echo "------------------------------------------------------------------------------" -echo "cp $source_template_dir/operations-conductor.template $dist_template_dir/operations-conductor.template" -cp $source_template_dir/operations-conductor.template $dist_template_dir/operations-conductor.template - -echo "------------------------------------------------------------------------------" -echo "[Packing] Build Script" -echo "------------------------------------------------------------------------------" -echo "cp $source_template_dir/build-s3-dist.sh $dist_template_dir" -cp $source_template_dir/build-s3-dist.sh $dist_template_dir -echo "cp $source_template_dir/run-unit-tests.sh $dist_template_dir" -cp $source_template_dir/run-unit-tests.sh $dist_template_dir - -echo "------------------------------------------------------------------------------" -echo "[Packing] Source Folder" -echo "------------------------------------------------------------------------------" -echo "cp -r $source_dir $dist_dir" -cp -r $source_dir $dist_dir -echo "cp $source_template_dir/../LICENSE.txt $dist_dir" -cp $source_template_dir/../LICENSE.txt $dist_dir -echo "cp $source_template_dir/../NOTICE.txt $dist_dir" -cp $source_template_dir/../NOTICE.txt $dist_dir -echo "cp $source_template_dir/../README.md $dist_dir" -cp $source_template_dir/../README.md $dist_dir -echo "cp $source_template_dir/../CODE_OF_CONDUCT.md $dist_dir" -cp $source_template_dir/../CODE_OF_CONDUCT.md $dist_dir -echo "cp $source_template_dir/../CONTRIBUTING.md $dist_dir" -cp $source_template_dir/../CONTRIBUTING.md $dist_dir -echo "cp $source_template_dir/../CHANGELOG.md $dist_dir" -cp $source_template_dir/../CHANGELOG.md $dist_dir -echo "cp $source_template_dir/../.gitignore $dist_dir" -cp $source_template_dir/../.gitignore $dist_dir - -echo "------------------------------------------------------------------------------" -echo "[Packing] Clean build, node_modules and coverage folders" -echo "------------------------------------------------------------------------------" -echo "find $dist_dir -iname "node_modules" -type d -exec rm -r "{}" \; 2> /dev/null" -find $dist_dir -iname "node_modules" -type d -exec rm -r "{}" \; 2> /dev/null -echo "find $dist_dir -iname "tests" -type d -exec rm -r "{}" \; 2> /dev/null" -find $dist_dir -iname "tests" -type d -exec rm -r "{}" \; 2> /dev/null -echo "find $dist_dir -iname "build" -type d -exec rm -r "{}" \; 2> /dev/null" -find $dist_dir -iname "build" -type d -exec rm -r "{}" \; 2> /dev/null -echo "find $dist_dir -iname "coverage" -type d -exec rm -r "{}" \; 2> /dev/null" -find $dist_dir -iname "coverage" -type d -exec rm -r "{}" \; 2> /dev/null -echo "find $dist_dir -type f -name 'package-lock.json' -delete" -find $dist_dir -type f -name 'package-lock.json' -delete - -echo "------------------------------------------------------------------------------" -echo "[Packing] Create GitHub (open-source) zip file" -echo "------------------------------------------------------------------------------" -echo "cd $dist_dir" -cd $dist_dir -echo "zip -q -r9 ../$1.zip *" -zip -q -r9 ../$1.zip * -echo "Clean up open-source folder" -echo "rm -rf *" -rm -rf * -echo "mv ../$1.zip ." -mv ../$1.zip . -echo "Completed building $1.zip dist" diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh index 0fb0904..36c003c 100755 --- a/deployment/build-s3-dist.sh +++ b/deployment/build-s3-dist.sh @@ -19,7 +19,7 @@ # Check to see if input has been provided: if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then echo "Please provide the base source bucket name, trademark approved solution name and version where the lambda code will eventually reside." - echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.2" + echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.3" exit 1 fi diff --git a/deployment/operations-conductor.template b/deployment/operations-conductor.template index feadd49..2a8ad0d 100644 --- a/deployment/operations-conductor.template +++ b/deployment/operations-conductor.template @@ -13,7 +13,7 @@ # limitations under the License. AWSTemplateFormatVersion: "2010-09-09" -Description: "(SO0065) - The AWS CloudFormation template for deployment of the %%SOLUTION_NAME%% Solution. Version %%VERSION%%" +Description: "(SO0065) - The AWS CloudFormation template for deployment of the Operations Conductor on AWS Solution. Version %%VERSION%%" Parameters: DocumentTagKey: diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index 325f8dc..0000000 --- a/sonar-project.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Note: Currently testing and supported with code coverage sonarqube -# collection for python lambda (python pytest, python unittest) and javascript jest. - -# Refer to https://docs.sonarqube.org/latest/project-administration/narrowing-the-focus/ -# for details on sources and exclusions. Note also .gitignore -sonar.sources=source,deployment -sonar.exclusions= \ - **/*.spec.ts, \ - **/__tests__/**, \ - **/node_modules/**, \ - **/jestconfig.json, \ - **/coverage/**, \ - **/build/** \ - - -sonar.sourceEncoding=UTF-8 - -# Sensor SonarJS Coverage [javascript] was not allowing globbing -# for sonar.javascript.lcov.reportPaths such as this -# source/test/coverage-reports/jest/*/lcov.info -# so we have to provide an explicit list of reportPaths -sonar.javascript.lcov.reportPaths= \ - source/services/coverage/lcov.info - -# Uncomment to enable debugging by default -#sonar.verbose=true -#sonar.log.level=DEBUG - -# Disable if needed -#sonar.scm.disabled=true diff --git a/source/console/package.json b/source/console/package.json index 4c9844e..bd3e3e1 100644 --- a/source/console/package.json +++ b/source/console/package.json @@ -1,7 +1,7 @@ { "name": "operations-conductor-console", "description": "The Operations Conductor Web console", - "version": "1.0.2", + "version": "1.0.3", "private": true, "dependencies": { "aws-amplify": "^1.2.3", diff --git a/source/console/public/index.html b/source/console/public/index.html index b598dbd..57b52e8 100644 --- a/source/console/public/index.html +++ b/source/console/public/index.html @@ -7,7 +7,7 @@ - AWS Operations Conductor + Operations Conductor on AWS diff --git a/source/console/src/App.tsx b/source/console/src/App.tsx index 8b32801..3a6d869 100644 --- a/source/console/src/App.tsx +++ b/source/console/src/App.tsx @@ -74,7 +74,7 @@ class App extends React.Component { - Operations Conductor + Operations Conductor on AWS