pushing updates for v2.7.0

## 2.7.0 - 2019-03-08

* [Issue #48](#48)
  * Fixed: Export-VaporShell was having various failures due to the Format-Json private function called during JSON conversion.
* Miscellaneous
  * Brought Resource Type and Property Type functions up to current spec sheet.
  * Added: Watch and Force parameters to New-VSStack and New-VSChangeSet to watch and/or force stack creation.
  * Added: Watch parameter to Remove-VSStack and Invoke-VSChangeSetExecution to watch stack events.
  * Updated: Watch-Stack to handle multiple stack watching at once.

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 <!-- TOC -->
 
+* [2.7.0 - 2019-03-08](#270---2019-03-08)
 * [2.6.3](#263)
 * [2.6.2](#262)
 * [2.6.1](#261)
@@ -40,6 +41,16 @@
 
 <!-- /TOC -->
 
+## 2.7.0 - 2019-03-08
+
+* [Issue #48](https://github.com/scrthq/VaporShell/issues/48)
+  * Fixed: `Export-VaporShell` was having various failures due to the `Format-Json` private function called during JSON conversion.
+* Miscellaneous
+  * Brought Resource Type and Property Type functions up to current spec sheet.
+  * Added: `Watch` and `Force` parameters to `New-VSStack` and `New-VSChangeSet` to watch and/or force stack creation.
+  * Added: `Watch` parameter to `Remove-VSStack` and `Invoke-VSChangeSetExecution` to watch stack events.
+  * Updated: `Watch-Stack` to handle multiple stack watching at once.
+
 ## 2.6.3
 
 * [Issue #44](https://github.com/scrthq/VaporShell/issues/44)

VaporShell/Private/Format-Json.ps1

@@ -1,16 +1,51 @@
-function Format-Json([Parameter(Mandatory, ValueFromPipeline)][String] $json) {
-  $indent = 0;
-  ($json -Split '\n' |
-    % {
-      if ($_ -match '[\}\]]') {
-        # This line contains  ] or }, decrement the indentation level
-        $indent--
-      }
-      $line = (' ' * $indent * 2) + $_.TrimStart().Replace(':  ', ': ')
-      if ($_ -match '[\{\[]') {
-        # This line contains [ or {, increment the indentation level
-        $indent++
-      }
-      $line
-  }) -Join "`n"
-}
+function Format-Json {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true, Position = 0, ValueFromPipeline = $true)]
+        [String]
+        $Json
+    )
+    Begin {
+        $cleaner = {
+            param([String]$Line)
+            Process{
+                [Regex]::Replace(
+                    $Line,
+                    "\\u(?<Value>[a-zA-Z0-9]{4})",
+                    {
+                        param($m)([char]([int]::Parse(
+                            $m.Groups['Value'].Value,
+                            [System.Globalization.NumberStyles]::HexNumber
+                        ))).ToString()
+                    }
+                )
+            }
+        }
+    }
+    Process {
+        if ($PSVersionTable.PSVersion.Major -lt 6) {
+            try {
+                $indent = 0;
+                $res = $Json -split '\n' | ForEach-Object {
+                    if ($_ -match '[\}\]]') {
+                        # This line contains  ] or }, decrement the indentation level
+                        $indent--
+                    }
+                    $line = (' ' * $indent * 2) + $_.TrimStart().Replace(':  ', ': ')
+                    if ($_ -match '[\{\[]') {
+                        # This line contains [ or {, increment the indentation level
+                        $indent++
+                    }
+                    $cleaner.Invoke($line)
+                }
+                $res -join "`n"
+            }
+            catch {
+                ($Json -split '\n' | ForEach-Object {$cleaner.Invoke($_)}) -join "`n"
+            }
+        }
+        else {
+            ($Json -split '\n' | ForEach-Object {$cleaner.Invoke($_)}) -join "`n"
+        }
+    }
+}

VaporShell/Public/Resource Property Types/Add-VSAlexaASKSkillAuthenticationConfiguration.ps1

@@ -1,4 +1,4 @@
-function Add-VSAlexaASKSkillAuthenticationConfiguration {
+function Add-VSAlexaASKSkillAuthenticationConfiguration {
     <#
     .SYNOPSIS
         Adds an Alexa::ASK::Skill.AuthenticationConfiguration resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAlexaASKSkillOverrides.ps1

@@ -1,4 +1,4 @@
-function Add-VSAlexaASKSkillOverrides {
+function Add-VSAlexaASKSkillOverrides {
     <#
     .SYNOPSIS
         Adds an Alexa::ASK::Skill.Overrides resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAlexaASKSkillSkillPackage.ps1

@@ -1,4 +1,4 @@
-function Add-VSAlexaASKSkillSkillPackage {
+function Add-VSAlexaASKSkillSkillPackage {
     <#
     .SYNOPSIS
         Adds an Alexa::ASK::Skill.SkillPackage resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerConfigurationId.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerConfigurationId {
+function Add-VSAmazonMQBrokerConfigurationId {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.ConfigurationId resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerLogList.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerLogList {
+function Add-VSAmazonMQBrokerLogList {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.LogList resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerMaintenanceWindow.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerMaintenanceWindow {
+function Add-VSAmazonMQBrokerMaintenanceWindow {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.MaintenanceWindow resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerTagsEntry.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerTagsEntry {
+function Add-VSAmazonMQBrokerTagsEntry {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.TagsEntry resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQBrokerUser.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQBrokerUser {
+function Add-VSAmazonMQBrokerUser {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Broker.User resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQConfigurationAssociationConfigurationId.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQConfigurationAssociationConfigurationId {
+function Add-VSAmazonMQConfigurationAssociationConfigurationId {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAmazonMQConfigurationTagsEntry.ps1

@@ -1,4 +1,4 @@
-function Add-VSAmazonMQConfigurationTagsEntry {
+function Add-VSAmazonMQConfigurationTagsEntry {
     <#
     .SYNOPSIS
         Adds an AWS::AmazonMQ::Configuration.TagsEntry resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayApiKeyStageKey.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayApiKeyStageKey {
+function Add-VSApiGatewayApiKeyStageKey {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::ApiKey.StageKey resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentAccessLogSetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentAccessLogSetting {
+function Add-VSApiGatewayDeploymentAccessLogSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.AccessLogSetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentCanarySetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentCanarySetting {
+function Add-VSApiGatewayDeploymentCanarySetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.CanarySetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentDeploymentCanarySettings.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentDeploymentCanarySettings {
+function Add-VSApiGatewayDeploymentDeploymentCanarySettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.DeploymentCanarySettings resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentMethodSetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentMethodSetting {
+function Add-VSApiGatewayDeploymentMethodSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.MethodSetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDeploymentStageDescription.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDeploymentStageDescription {
+function Add-VSApiGatewayDeploymentStageDescription {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Deployment.StageDescription resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDocumentationPartLocation.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDocumentationPartLocation {
+function Add-VSApiGatewayDocumentationPartLocation {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DocumentationPart.Location resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayDomainNameEndpointConfiguration.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayDomainNameEndpointConfiguration {
+function Add-VSApiGatewayDomainNameEndpointConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::DomainName.EndpointConfiguration resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegration.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayMethodIntegration {
+function Add-VSApiGatewayMethodIntegration {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method.Integration resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodIntegrationResponse.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayMethodIntegrationResponse {
+function Add-VSApiGatewayMethodIntegrationResponse {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method.IntegrationResponse resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayMethodMethodResponse.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayMethodMethodResponse {
+function Add-VSApiGatewayMethodMethodResponse {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Method.MethodResponse resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiEndpointConfiguration.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayRestApiEndpointConfiguration {
+function Add-VSApiGatewayRestApiEndpointConfiguration {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::RestApi.EndpointConfiguration resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayRestApiS3Location.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayRestApiS3Location {
+function Add-VSApiGatewayRestApiS3Location {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::RestApi.S3Location resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageAccessLogSetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayStageAccessLogSetting {
+function Add-VSApiGatewayStageAccessLogSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Stage.AccessLogSetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageCanarySetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayStageCanarySetting {
+function Add-VSApiGatewayStageCanarySetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Stage.CanarySetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayStageMethodSetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayStageMethodSetting {
+function Add-VSApiGatewayStageMethodSetting {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::Stage.MethodSetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanApiStage.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayUsagePlanApiStage {
+function Add-VSApiGatewayUsagePlanApiStage {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan.ApiStage resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanQuotaSettings.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayUsagePlanQuotaSettings {
+function Add-VSApiGatewayUsagePlanQuotaSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan.QuotaSettings resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayUsagePlanThrottleSettings.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayUsagePlanThrottleSettings {
+function Add-VSApiGatewayUsagePlanThrottleSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGateway::UsagePlan.ThrottleSettings resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayV2RouteParameterConstraints.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayV2RouteParameterConstraints {
+function Add-VSApiGatewayV2RouteParameterConstraints {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGatewayV2::Route.ParameterConstraints resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayV2RouteResponseParameterConstraints.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayV2RouteResponseParameterConstraints {
+function Add-VSApiGatewayV2RouteResponseParameterConstraints {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGatewayV2::RouteResponse.ParameterConstraints resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayV2StageAccessLogSettings.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayV2StageAccessLogSettings {
+function Add-VSApiGatewayV2StageAccessLogSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGatewayV2::Stage.AccessLogSettings resource property to the template

VaporShell/Public/Resource Property Types/Add-VSApiGatewayV2StageRouteSettings.ps1

@@ -1,4 +1,4 @@
-function Add-VSApiGatewayV2StageRouteSettings {
+function Add-VSApiGatewayV2StageRouteSettings {
     <#
     .SYNOPSIS
         Adds an AWS::ApiGatewayV2::Stage.RouteSettings resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamDirectoryConfigServiceAccountCredentials.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamDirectoryConfigServiceAccountCredentials {
+function Add-VSAppStreamDirectoryConfigServiceAccountCredentials {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::DirectoryConfig.ServiceAccountCredentials resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamFleetComputeCapacity.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamFleetComputeCapacity {
+function Add-VSAppStreamFleetComputeCapacity {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::Fleet.ComputeCapacity resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamFleetDomainJoinInfo.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamFleetDomainJoinInfo {
+function Add-VSAppStreamFleetDomainJoinInfo {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::Fleet.DomainJoinInfo resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamFleetVpcConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamFleetVpcConfig {
+function Add-VSAppStreamFleetVpcConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::Fleet.VpcConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamImageBuilderDomainJoinInfo.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamImageBuilderDomainJoinInfo {
+function Add-VSAppStreamImageBuilderDomainJoinInfo {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::ImageBuilder.DomainJoinInfo resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamImageBuilderVpcConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamImageBuilderVpcConfig {
+function Add-VSAppStreamImageBuilderVpcConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::ImageBuilder.VpcConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamStackApplicationSettings.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamStackApplicationSettings {
+function Add-VSAppStreamStackApplicationSettings {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::Stack.ApplicationSettings resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamStackStorageConnector.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamStackStorageConnector {
+function Add-VSAppStreamStackStorageConnector {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::Stack.StorageConnector resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppStreamStackUserSetting.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppStreamStackUserSetting {
+function Add-VSAppStreamStackUserSetting {
     <#
     .SYNOPSIS
         Adds an AWS::AppStream::Stack.UserSetting resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceAuthorizationConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceAuthorizationConfig {
+function Add-VSAppSyncDataSourceAuthorizationConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.AuthorizationConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceAwsIamConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceAwsIamConfig {
+function Add-VSAppSyncDataSourceAwsIamConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.AwsIamConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceDynamoDBConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceDynamoDBConfig {
+function Add-VSAppSyncDataSourceDynamoDBConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.DynamoDBConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceElasticsearchConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceElasticsearchConfig {
+function Add-VSAppSyncDataSourceElasticsearchConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.ElasticsearchConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceHttpConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceHttpConfig {
+function Add-VSAppSyncDataSourceHttpConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.HttpConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceLambdaConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceLambdaConfig {
+function Add-VSAppSyncDataSourceLambdaConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.LambdaConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceRdsHttpEndpointConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceRdsHttpEndpointConfig {
+function Add-VSAppSyncDataSourceRdsHttpEndpointConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.RdsHttpEndpointConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncDataSourceRelationalDatabaseConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncDataSourceRelationalDatabaseConfig {
+function Add-VSAppSyncDataSourceRelationalDatabaseConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::DataSource.RelationalDatabaseConfig resource property to the template

VaporShell/Public/Resource Property Types/Add-VSAppSyncGraphQLApiLogConfig.ps1

@@ -1,4 +1,4 @@
-function Add-VSAppSyncGraphQLApiLogConfig {
+function Add-VSAppSyncGraphQLApiLogConfig {
     <#
     .SYNOPSIS
         Adds an AWS::AppSync::GraphQLApi.LogConfig resource property to the template