fixes #51, fixes #52, fixes #53, bump version to 5.0.2

Signed-off-by: Irving Popovetsky <irving@chef.io>

README.md

@@ -39,8 +39,8 @@ You can launch this stack with the push of a button:
 
 | Edition | Version | Est Monthly cost | Launch button |
 | ------- | ------- | ---------------- | ------------- |
-| High Performance | 5.0.1 | [$1500*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=calc-E9251374-D80C-45B7-BED7-C9C9778B1D6C) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.0.1%2Fmain.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
-| Lowest Cost | 5.0.1 | [$320*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=files/calc-165638db8e331664846c0d6654d743377bd3eac6&v=ver20190604sQ) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.0.1%2Fmarketplace.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
+| High Performance | 5.0.2 | [$1500*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=calc-E9251374-D80C-45B7-BED7-C9C9778B1D6C) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.0.2%2Fmain.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
+| Lowest Cost | 5.0.2 | [$320*](https://calculator.s3.amazonaws.com/index.html#r=IAD&s=EC2&key=files/calc-165638db8e331664846c0d6654d743377bd3eac6&v=ver20190604sQ) | <p><a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?templateURL=https:%2F%2Fs3.amazonaws.com%2Faws-native-chef-server%2F5.0.2%2Fmarketplace.yaml&amp;stackName=my-chef-stack" target="_blank"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack" /></a></p> |
 
 _*NOTE: Estimated costs are just that, your mileage will vary. Use reserved instances to greatly reduce costs for long-running clusters._
 
@@ -50,7 +50,7 @@ However, the most repeatable and least error-prone way to launch this stack is t
 ```bash
 MYBUCKET=aws-native-chef-server
 MYID=mycompany
-VERSION=5.0.1
+VERSION=5.0.2
 EDITION=main  # main or marketplace
 # Configure the automate_stack_parameters.json and then launch the cloudformation stack:
 # If you're using your own bucket, uncomment the next line:
@@ -71,7 +71,7 @@ If you've made changes to the template content or parameters and you wish to upd
 ```bash
 MYBUCKET=aws-native-chef-server
 MYID=mycompany
-VERSION=5.0.1
+VERSION=5.0.2
 EDITION=main  # main or marketplace
 # If you're using your own bucket, uncomment the next line:
 # aws s3 sync . s3://$MYBUCKET/$VERSION/ --exclude "*" --include "*.yaml" --include "files/*" && \

automate.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Automate 2 (auto-recovering standalone) v5.0.1
+Description: AWS Native Automate 2 (auto-recovering standalone) v5.0.2
 
 Parameters:
   # Required Parameters

chef_elasticsearch.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server Elasticsearch 5.0.1
+Description: Chef Server Elasticsearch 5.0.2
 
 Parameters:
   # Required Parameters

chef_rds.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Chef Server PostgreSQL v5.0.1
+Description: Chef Server PostgreSQL v5.0.2
 
 Parameters:
   # Required Parameters

chef_server_ha.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Server (auto-scaling HA) v5.0.1
+Description: AWS Native Chef Server (auto-scaling HA) v5.0.2
 
 Parameters:
   # Required Parameters
@@ -165,6 +165,10 @@ Parameters:
     Default: ''
     Type: String
     Description: The S3 location of a custom chef-server configuration snippet that will be injected into the chef-server.rb (optional)
+  SupermarketUrl:
+    Description: The URL of the Private Supermarket Server, for oc-id authentication.  Leave blank to disable.
+    Type: String
+    Default: ''
   Route53HostedZone:
     Type: String
     Default: ''
@@ -181,7 +185,7 @@ Parameters:
     Type: String
   TemplateVersion:
     Type: String
-    Default: "5.0.1"
+    Default: "5.0.2"
 
 Metadata:
   cfn-lint:
@@ -505,15 +509,18 @@ Resources:
                 rabbitmq['queue_length_monitor_enabled'] = false
                 opscode_expander['enable'] = false
                 dark_launch['actions'] = false
-                oc_id['applications'] ||= {}
-                oc_id['applications']['supermarket'] = {
-                  'redirect_uri' => 'https://supermarket.${Route53HostedZone}/auth/chef_oauth2/callback'
-                }
+                unless '${SupermarketUrl}'.empty?
+                  oc_id['applications'] ||= {}
+                  oc_id['applications']['supermarket'] = {
+                    'redirect_uri' => 'https://${SupermarketUrl}/auth/chef_oauth2/callback'
+                  }
+                end
                 default_orgname '${ChefDefaultOrgName}'.empty? ? null : '${ChefDefaultOrgName}'
                 # special handling for Chef Automate URL and Token which might be empty strings
                 unless '${ChefAutomateServerUrl}'.empty? || '${ChefAutomateToken}'.empty?
-                  data_collector['root_url'] = '${ChefAutomateServerUrl}'
+                  data_collector['root_url'] = '${ChefAutomateServerUrl}/data-collector/v0/'
                   data_collector['token'] = '${ChefAutomateToken}'
+                  profiles['root_url'] = '${ChefAutomateServerUrl}'
                 end
               - { DNSNAME: !If [CreateRoute53Record, !Sub "${Route53RecordName}.${Route53HostedZone}", !GetAtt ChefALB.DNSName] }
           commands:

chef_server_ops_dashboard.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native OpsDashboard for Chef Server v5.0.1
+Description: AWS Native OpsDashboard for Chef Server v5.0.2
 
 Parameters:
   # Required Parameters

main.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack v5.0.1
+Description: AWS Native Chef Stack v5.0.2
 
 Parameters:
   # Required Parameters
@@ -81,7 +81,7 @@ Parameters:
     Default: '100'
     Type: String
   ChefDBIops:
-    Description: IOPS allocated to the storage (storage size * 10)
+    Description: IOPS reserved for DB storage, only applicable if ChefDBStorageType is io1 (ChefDBAllocatedStorage * 10)
     Default: '1000'
     Type: String
   ChefDBBackupDaystoKeep:
@@ -184,7 +184,7 @@ Parameters:
   TemplateVersion:
     Description: The version of this template to use (do not change this unless directed by support)
     Type: String
-    Default: "5.0.1"
+    Default: "5.0.2"
   Route53HostedZone:
     Type: String
     Default: ''
@@ -481,6 +481,7 @@ Resources:
         ChefSecretsBucket: !If [CreateChefSecretsBucket, !Ref ChefBucket, !Ref ExistingSecretsBucket]
         ChefAutomateServerUrl: !Sub "https://${AutomateStack.Outputs.DNSName}"
         ChefAutomateToken: !Ref ChefAutomateToken
+        SupermarketUrl: !Sub "https://${SupermarketDnsRecordName}.${Route53HostedZone}"
         Route53HostedZone: !Ref Route53HostedZone
         Route53RecordName: !Ref ChefServerDnsRecordName
         SystemLogsGroup: !Ref SystemLogs

marketplace.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Chef Stack for Marketplace v5.0.1
+Description: AWS Native Chef Stack for Marketplace v5.0.2
 
 Parameters:
   # Required Parameters
@@ -101,7 +101,7 @@ Parameters:
     Default: '20'
     Type: String
   ChefDBIops:
-    Description: IOPS allocated to the storage (storage size * 10)
+    Description: IOPS reserved for DB storage, only applicable if ChefDBStorageType is io1 (ChefDBAllocatedStorage * 10)
     Default: '1000'
     Type: String
   ChefDBBackupDaystoKeep:
@@ -179,7 +179,7 @@ Parameters:
   TemplateVersion:
     Description: The version of this template to use (do not change this unless directed by support)
     Type: String
-    Default: "5.0.1"
+    Default: "5.0.2"
   LogsRetentionInDays:
     Description: Specifies the number of days you want to retain cloudwatch log events.
     Type: Number
@@ -478,6 +478,7 @@ Resources:
         ChefSecretsBucket: !Ref ChefBucket
         ChefAutomateServerUrl: !Sub "https://${AutomateStack.Outputs.DNSName}"
         ChefAutomateToken: !Ref ChefAutomateToken
+        SupermarketUrl: !Sub "https://${SupermarketDnsRecordName}.${Route53HostedZone}"
         Route53HostedZone: !Ref Route53HostedZone
         Route53RecordName: !Ref ChefServerDnsRecordName
         SystemLogsGroup: !Ref SystemLogs

supermarket.yaml

@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: AWS Native Supermarket (auto-recovering standalone) v5.0.1
+Description: AWS Native Supermarket (auto-recovering standalone) v5.0.2
 
 Parameters:
   # Required Parameters