Merge pull request #14 from aws-solutions/release/v1.0.3

Updated to version v1.0.3

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.

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.

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
 

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:

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",

source/console/public/index.html

@@ -7,7 +7,7 @@
         <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
         <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
         <link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon.png" />
-        <title>AWS Operations Conductor</title>
+        <title>Operations Conductor on AWS</title>
     </head>
     <body>
         <noscript> You need to enable JavaScript to run this app. </noscript>

source/console/src/App.tsx

@@ -74,7 +74,7 @@ class App extends React.Component<IProps, IState> {
                     <Router>
                         <Navbar>
                             <Navbar.Header>
-                                <Navbar.Brand>Operations Conductor</Navbar.Brand>
+                                <Navbar.Brand>Operations Conductor on AWS</Navbar.Brand>
                             </Navbar.Header>
                             <Nav>
                                 <LinkContainer to="/tasks">

source/console/src/components/CustomForgotPassword.tsx

@@ -46,7 +46,7 @@ class CustomForgotPassword extends ForgotPassword {
             <div className="main-wrapper">
                 <Navbar>
                     <Navbar.Header>
-                        <Navbar.Brand>Operations Conductor</Navbar.Brand>
+                        <Navbar.Brand>Operations Conductor on AWS</Navbar.Brand>
                     </Navbar.Header>
                 </Navbar>
                 <Grid>

source/console/src/components/CustomRequireNewPassword.tsx

@@ -40,7 +40,7 @@ class CustomRequireNewPassword extends RequireNewPassword {
             <div className="main-wrapper">
                 <Navbar>
                     <Navbar.Header>
-                        <Navbar.Brand>Operations Conductor</Navbar.Brand>
+                        <Navbar.Brand>Operations Conductor on AWS</Navbar.Brand>
                     </Navbar.Header>
                 </Navbar>
                 <Grid>

source/console/src/components/CustomSignIn.tsx

@@ -41,7 +41,7 @@ class CustomSignIn extends SignIn {
             <div className="main-wrapper">
                 <Navbar>
                     <Navbar.Header>
-                        <Navbar.Brand>Operations Conductor</Navbar.Brand>
+                        <Navbar.Brand>Operations Conductor on AWS</Navbar.Brand>
                     </Navbar.Header>
                 </Navbar>
                 <Grid>

source/console/src/components/CustomVerifyContact.tsx

@@ -42,7 +42,7 @@ class CustomVerifyContact extends VerifyContact {
             <div className="main-wrapper">
                 <Navbar>
                     <Navbar.Header>
-                        <Navbar.Brand>Operations Conductor</Navbar.Brand>
+                        <Navbar.Brand>Operations Conductor on AWS</Navbar.Brand>
                     </Navbar.Header>
                 </Navbar>
                 <Grid>

source/console/src/views/TaskCreate.tsx

@@ -898,7 +898,7 @@ class TaskCreate extends React.Component<IProps, IState> {
 												event.persist();
 												this.handleAccountsChange(event);
 											}} />
-                                        <HelpBlock>List of accounts in which Operations Conductor should operate. Requires 12 digit account IDs</HelpBlock>
+                                        <HelpBlock>List of accounts in which Operations Conductor on AWS should operate. Requires 12 digit account IDs</HelpBlock>
                                         {
                                             this.state.showHelp.accounts &&
                                             <HelpBlock>Accounts cannot be empty.</HelpBlock>
@@ -916,7 +916,7 @@ class TaskCreate extends React.Component<IProps, IState> {
 												this.handleRegionsChange(event);
 											}} />
                                         <HelpBlock>
-                                            List of regions in which Operations Conductor should operate. Requires region codes (e.g. us-east-1). <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions" target="_blank" rel="noopener noreferrer">See more</a> about the available region codes.
+                                            List of regions in which Operations Conductor on AWS should operate. Requires region codes (e.g. us-east-1). <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions" target="_blank" rel="noopener noreferrer">See more</a> about the available region codes.
                                         </HelpBlock>
                                         {
                                             this.state.showHelp.accounts &&

source/services/actions/actions.spec.ts

@@ -87,13 +87,14 @@ describe('Actions', () => {
         });
 
         test('returns a success response', (done) => {
-            mockSsm.mockImplementationOnce(() => {
+            mockSsm.mockImplementationOnce((data) => {
+                expect(data).toStrictEqual({"Filters":[{"Key":"tag:SomeKey","Values":["SomeValue"]},{"Key":"Owner","Values":["Self"]}]})
                 return {
                     promise() {
                         return Promise.resolve(mockDocuments);
                     }
                 };
-            }).mockImplementationOnce(() => {
+            }).mockImplementationOnce((data) => {
                 return {
                     promise() {
                         return Promise.resolve(mockDocument);
@@ -113,7 +114,8 @@ describe('Actions', () => {
             let documentsWithNextToken = mockDocuments;
             documentsWithNextToken['NextToken'] = 'token';
 
-            mockSsm.mockImplementationOnce(() => {
+            mockSsm.mockImplementationOnce((data) => {
+                expect(data).toStrictEqual({"Filters":[{"Key":"tag:SomeKey","Values":["SomeValue"]},{"Key":"Owner","Values":["Self"]}]})
                 return {
                     promise() {
                         return Promise.resolve(documentsWithNextToken);
@@ -149,7 +151,8 @@ describe('Actions', () => {
         });
 
         test('returns an error when getting actions fails', (done) => {
-            mockSsm.mockImplementation(() => {
+            mockSsm.mockImplementation((data) => {
+                expect(data).toStrictEqual({"Filters":[{"Key":"tag:SomeKey","Values":["SomeValue"]},{"Key":"Owner","Values":["Self"]}]})
                 return {
                     promise() {
                         return Promise.reject('error');