More testing and code cleanup

src/cfnlint/data/CloudSpecs/us-east-1.json

@@ -151665,7 +151665,7 @@
    ]
   },
   "AWS::GameLift::Fleet.BuildId": {
-   "AllowedPatternRegex": "^build-\\S+|^arn:.*:build\\/build-\\S+"
+   "AllowedPatternRegex": "^build-\\S+|^arn:.*:build/build-\\S+"
   },
   "AWS::GameLift::Fleet.CertificateConfiguration.CertificateType": {
    "AllowedValues": [
@@ -151830,7 +151830,7 @@
    "NumberMin": 1
   },
   "AWS::GameLift::Fleet.IpPermission.IpRange": {
-   "AllowedPatternRegex": "(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$)"
+   "AllowedPatternRegex": "(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(/([0-9]|[1-2][0-9]|3[0-2]))$)"
   },
   "AWS::GameLift::Fleet.IpPermission.Protocol": {
    "AllowedValues": [
@@ -151843,7 +151843,7 @@
    "NumberMin": 1
   },
   "AWS::GameLift::Fleet.LocationConfiguration.Location": {
-   "AllowedPatternRegex": "^[a-z]+(-([a-z]+|\\d))*",
+   "AllowedPatternRegex": "^[A-Za-z0-9\\-]+",
    "StringMax": 64,
    "StringMin": 1
   },
@@ -151876,7 +151876,7 @@
    "NumberMin": 1
   },
   "AWS::GameLift::Fleet.ScriptId": {
-   "AllowedPatternRegex": "^script-\\S+|^arn:.*:script\\/script-\\S+"
+   "AllowedPatternRegex": "^script-\\S+|^arn:.*:script/script-\\S+"
   },
   "AWS::GameLift::Fleet.ServerProcess.LaunchPath": {
    "AllowedPatternRegex": "^([Cc]:\\\\game\\S+|/local/game/\\S+)",

src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json

@@ -1 +1 @@
-{"etag": "\"2481f3782711bb14d6845d7e8283aaed\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"854ad8e919512bf5dae6d73f1704f6b0\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json

@@ -1 +1 @@
-{"etag": "\"ad84c734b0b05ab328ba22c04ded4823\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"d97c4455f0fc833fc262942c45a105dd\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json

@@ -1 +1 @@
-{"etag": "\"06f88cce0a130a2e041a7d8b0773a1ee\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"3905f23c2563b53184bddb98cc9d9667\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json

@@ -1 +1 @@
-{"etag": "\"76e705400b23d6fc5a04e48b3a05660e\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"312b95b1bd82cd1f06078294e741174b\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json

@@ -1 +1 @@
-{"etag": "\"d8df69b734f281994b70fb6a8f0d0c06\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"b3102d7b242f02bfc2d270834d02d06e\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json

@@ -1 +1 @@
-{"etag": "\"81f62f7551ecdc8e314f33d85739e2aa\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"b586cfde0ea1ddb42edc6e0f6e968a1a\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json

@@ -1 +1 @@
-{"etag": "\"821eb3cfd08ce02cc015f4a09ba67d7a\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"198bfd8016be558198e9cc2a83f0e819\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json

@@ -1 +1 @@
-{"etag": "\"49a2d78bc5ae667211055ca4fcd45009\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"1551fe8a4eefcd87edf4ec3f3ba58805\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json

@@ -1 +1 @@
-{"etag": "\"4f6fd78d2343e113950b544b382a35f8\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"893f1af0ed3a725eaad150645b1edb60\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json

@@ -1 +1 @@
-{"etag": "\"f6a04ec1c41ac73dbd99ab1491aa739b\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"0064feaf1c05b8ad7db2e08b5dddd08a\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json

@@ -1 +1 @@
-{"etag": "\"b6d099e4ee90e3a6cd30772150a1e45a\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"3209385473a21967d806d84381e46a9b\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json

@@ -1 +1 @@
-{"etag": "\"00ce71359e953de9dd5049672926e225\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"4ed7ed63d02f581f988a5549fb31f38a\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json

@@ -1 +1 @@
-{"etag": "\"9a2623046bc548aa82cb5f13d1304c2b\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"d9c831c53fef5ade162a6397dc82dfd2\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json

@@ -1 +1 @@
-{"etag": "\"59fe345daacecd3eec4df0bafbf39e31\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"fca4818590f1cba0e1c9c4b6ad2dd8fb\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}

src/cfnlint/data/ProviderSchemas/ap-northeast-1/aws-ivs-recordingconfiguration.json

@@ -0,0 +1 @@
+/Users/kddejong/code/github.com/aws-cloudformation/cfn-python-lint/src/cfnlint/data/ProviderSchemas/us-east-1/aws-ivs-recordingconfiguration.json

src/cfnlint/data/ProviderSchemas/ap-southeast-3/aws-elasticache-user.json

@@ -0,0 +1 @@
+/Users/kddejong/code/github.com/aws-cloudformation/cfn-python-lint/src/cfnlint/data/ProviderSchemas/us-east-1/aws-elasticache-user.json

src/cfnlint/data/ProviderSchemas/ap-southeast-3/aws-elasticache-usergroup.json

@@ -0,0 +1 @@
+/Users/kddejong/code/github.com/aws-cloudformation/cfn-python-lint/src/cfnlint/data/ProviderSchemas/us-east-1/aws-elasticache-usergroup.json

src/cfnlint/data/ProviderSchemas/eu-central-1/aws-elasticbeanstalk-configurationtemplate.json

@@ -1,111 +1,76 @@
 {
   "typeName" : "AWS::ElasticBeanstalk::ConfigurationTemplate",
   "description" : "Resource Type definition for AWS::ElasticBeanstalk::ConfigurationTemplate",
-  "sourceUrl" : "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-elasticbeanstalk.git",
-  "$schema" : "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/master/src/main/resources/schema/provider.definition.schema.v1.json",
   "additionalProperties" : false,
+  "properties" : {
+    "EnvironmentId" : {
+      "type" : "string"
+    },
+    "PlatformArn" : {
+      "type" : "string"
+    },
+    "ApplicationName" : {
+      "type" : "string"
+    },
+    "Description" : {
+      "type" : "string"
+    },
+    "OptionSettings" : {
+      "type" : "array",
+      "uniqueItems" : false,
+      "items" : {
+        "$ref" : "#/definitions/ConfigurationOptionSetting"
+      }
+    },
+    "SourceConfiguration" : {
+      "$ref" : "#/definitions/SourceConfiguration"
+    },
+    "TemplateName" : {
+      "type" : "string"
+    },
+    "SolutionStackName" : {
+      "type" : "string"
+    },
+    "Id" : {
+      "type" : "string"
+    }
+  },
   "definitions" : {
     "SourceConfiguration" : {
       "type" : "object",
       "additionalProperties" : false,
       "properties" : {
-        "ApplicationName" : {
-          "description" : "The name of the application associated with the configuration.",
+        "TemplateName" : {
           "type" : "string"
         },
-        "TemplateName" : {
-          "description" : "The name of the configuration template.",
+        "ApplicationName" : {
           "type" : "string"
         }
       },
-      "required" : [ "TemplateName", "ApplicationName" ]
+      "required" : [ "ApplicationName", "TemplateName" ]
     },
     "ConfigurationOptionSetting" : {
       "type" : "object",
       "additionalProperties" : false,
       "properties" : {
-        "Namespace" : {
-          "description" : "A unique namespace that identifies the option's associated AWS resource.",
+        "Value" : {
           "type" : "string"
         },
-        "OptionName" : {
-          "description" : "The name of the configuration option.",
+        "ResourceName" : {
           "type" : "string"
         },
-        "ResourceName" : {
-          "description" : "A unique resource name for the option setting. Use it for a time–based scaling configuration option. ",
+        "Namespace" : {
           "type" : "string"
         },
-        "Value" : {
-          "description" : "The current value for the configuration option.",
+        "OptionName" : {
           "type" : "string"
         }
       },
       "required" : [ "Namespace", "OptionName" ]
     }
   },
-  "properties" : {
-    "ApplicationName" : {
-      "description" : "The name of the Elastic Beanstalk application to associate with this configuration template. ",
-      "type" : "string"
-    },
-    "Description" : {
-      "description" : "An optional description for this configuration.",
-      "type" : "string"
-    },
-    "EnvironmentId" : {
-      "description" : "The ID of an environment whose settings you want to use to create the configuration template. You must specify EnvironmentId if you don't specify PlatformArn, SolutionStackName, or SourceConfiguration. ",
-      "type" : "string"
-    },
-    "OptionSettings" : {
-      "description" : "Option values for the Elastic Beanstalk configuration, such as the instance type. If specified, these values override the values obtained from the solution stack or the source configuration template. For a complete list of Elastic Beanstalk configuration options, see [Option Values](https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html) in the AWS Elastic Beanstalk Developer Guide. ",
-      "type" : "array",
-      "uniqueItems" : false,
-      "insertionOrder" : false,
-      "items" : {
-        "$ref" : "#/definitions/ConfigurationOptionSetting"
-      }
-    },
-    "PlatformArn" : {
-      "description" : "The Amazon Resource Name (ARN) of the custom platform. For more information, see [Custom Platforms](https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/custom-platforms.html) in the AWS Elastic Beanstalk Developer Guide. ",
-      "type" : "string"
-    },
-    "SolutionStackName" : {
-      "description" : "The name of an Elastic Beanstalk solution stack (platform version) that this configuration uses. For example, 64bit Amazon Linux 2013.09 running Tomcat 7 Java 7. A solution stack specifies the operating system, runtime, and application server for a configuration template. It also determines the set of configuration options as well as the possible and default values. For more information, see [Supported Platforms](https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/concepts.platforms.html) in the AWS Elastic Beanstalk Developer Guide.\n\n You must specify SolutionStackName if you don't specify PlatformArn, EnvironmentId, or SourceConfiguration.\n\n Use the ListAvailableSolutionStacks API to obtain a list of available solution stacks. ",
-      "type" : "string"
-    },
-    "SourceConfiguration" : {
-      "description" : "An Elastic Beanstalk configuration template to base this one on. If specified, Elastic Beanstalk uses the configuration values from the specified configuration template to create a new configuration.\n\nValues specified in OptionSettings override any values obtained from the SourceConfiguration.\n\nYou must specify SourceConfiguration if you don't specify PlatformArn, EnvironmentId, or SolutionStackName.\n\nConstraint: If both solution stack name and source configuration are specified, the solution stack of the source configuration template must match the specified solution stack name. ",
-      "$ref" : "#/definitions/SourceConfiguration"
-    },
-    "TemplateName" : {
-      "description" : "The name of the configuration template",
-      "type" : "string"
-    }
-  },
   "required" : [ "ApplicationName" ],
-  "tagging" : {
-    "taggable" : false
-  },
-  "createOnlyProperties" : [ "/properties/ApplicationName", "/properties/EnvironmentId", "/properties/PlatformArn", "/properties/SolutionStackName", "/properties/SourceConfiguration" ],
-  "primaryIdentifier" : [ "/properties/ApplicationName", "/properties/TemplateName" ],
-  "readOnlyProperties" : [ "/properties/TemplateName" ],
-  "writeOnlyProperties" : [ "/properties/EnvironmentId", "/properties/SourceConfiguration/ApplicationName", "/properties/SourceConfiguration/TemplateName" ],
-  "handlers" : {
-    "create" : {
-      "permissions" : [ "elasticbeanstalk:CreateConfigurationTemplate" ]
-    },
-    "read" : {
-      "permissions" : [ "elasticbeanstalk:DescribeConfigurationSettings" ]
-    },
-    "update" : {
-      "permissions" : [ "elasticbeanstalk:UpdateConfigurationTemplate" ]
-    },
-    "delete" : {
-      "permissions" : [ "elasticbeanstalk:DeleteConfigurationTemplate", "elasticbeanstalk:DescribeConfigurationSettings" ]
-    },
-    "list" : {
-      "permissions" : [ "elasticbeanstalk:DescribeApplications" ]
-    }
-  }
+  "createOnlyProperties" : [ "/properties/PlatformArn", "/properties/ApplicationName", "/properties/SolutionStackName", "/properties/EnvironmentId", "/properties/SourceConfiguration" ],
+  "primaryIdentifier" : [ "/properties/Id" ],
+  "readOnlyProperties" : [ "/properties/TemplateName", "/properties/Id" ]
 }