Improve init method signature

Author: Andrea-Scuderi

Sources/SwiftSlsAdapter/Function.swift

@@ -59,32 +59,32 @@ public struct Function: Codable, Equatable {
  image: String? = nil,
  runtime: Runtime?,
  memorySize: Int?,
- timeout: Int?,
- environment: YAMLContent?,
- ephemeralStorageSize: Int?,
- name: String?,
+ timeout: Int? = nil,
+ environment: YAMLContent? = nil,
+ ephemeralStorageSize: Int? = nil,
+ name: String? = nil,
  description: String,
- architecture: Architecture?,
- reservedConcurrency: Int?,
- provisionedConcurrency: Int?,
- role: String?,
- onError: String?,
- kmsKeyArn: String?,
- snapStart: Bool?,
- disableLogs: Bool?,
- logRetentionInDays: Int?,
- tags: [String: String]?,
- vpc: YAMLContent?,
- url: YAMLContent?,
+ architecture: Architecture? = nil,
+ reservedConcurrency: Int? = nil,
+ provisionedConcurrency: Int? = nil,
+ role: String? = nil,
+ onError: String? = nil,
+ kmsKeyArn: String? = nil,
+ snapStart: Bool? = nil,
+ disableLogs: Bool? = nil,
+ logRetentionInDays: Int? = nil,
+ tags: [String: String]? = nil,
+ vpc: YAMLContent? = nil,
+ url: YAMLContent? = nil,
  package: Package?,
  layers: YAMLContent?,
- tracing: Tracing?,
- condition: YAMLContent?,
- dependsOn: [String]?,
- destinations: YAMLContent?,
- fileSystemConfig: YAMLContent?,
- maximumRetryAttempts: Int?,
- maximumEventAge: Int?,
+ tracing: Tracing? = nil,
+ condition: YAMLContent? = nil,
+ dependsOn: [String]? = nil,
+ destinations: YAMLContent? = nil,
+ fileSystemConfig: YAMLContent? = nil,
+ maximumRetryAttempts: Int? = nil,
+ maximumEventAge: Int? = nil,
  events: [FunctionEvent]
  ) {
  self.handler = handler
@@ -264,7 +264,7 @@ public struct EventHTTPAPI: Codable, Equatable {
  public init(
  path: String,
  method: HTTPMethod,
- authorizer: YAMLContent?
+ authorizer: YAMLContent? = nil
  ) {
  self.path = path
  self.method = method

Sources/SwiftSlsAdapter/Package.swift

@@ -29,7 +29,7 @@ public struct Package: Codable, Equatable {
  public init(
  patterns: [String]?,
  individually: Bool?,
- artifact: String?
+ artifact: String? = nil
  ) {
  self.patterns = patterns
  self.individually = individually

Sources/SwiftSlsAdapter/Provider.swift

@@ -48,23 +48,23 @@ public struct Provider: Codable, Equatable {
  /// - iam: IAM permissions
  public init(
  name: Provider.CloudProvider,
- stage: Provider.Stage,
+ stage: Provider.Stage? = nil,
  region: Region,
- profile: String?,
- tags: [String: String]?,
- stackName: String?,
- deploymentMethod: Provider.DeploymentMethod,
- notificationArns: [String]?,
- stackParameters: [Provider.StackParameters]?,
+ profile: String? = nil,
+ tags: [String: String]? = nil,
+ stackName: String? = nil,
+ deploymentMethod: Provider.DeploymentMethod = .changesets,
+ notificationArns: [String]? = nil,
+ stackParameters: [Provider.StackParameters]? = nil,
  disableRollback: Bool = false,
- rollbackConfiguration: Provider.RollbackConfiguration?,
+ rollbackConfiguration: Provider.RollbackConfiguration? = nil,
  runtime: Runtime,
- memorySize: Int?,
- timeout: Int?,
+ memorySize: Int? = nil,
+ timeout: Int? = nil,
  environment: YAMLContent?,
- logRetentionInDays: Int?,
- logDataProtectionPolicy: YAMLContent?,
- kmsKeyArn: String?,
+ logRetentionInDays: Int? = nil,
+ logDataProtectionPolicy: YAMLContent? = nil,
+ kmsKeyArn: String? = nil,
  lambdaHashingVersion: String,
  versionFunctions: Bool = true,
  architecture: Architecture,
@@ -102,7 +102,7 @@ public struct Provider: Codable, Equatable {
  public let name: CloudProvider
 
  /// Default stage (default: dev)
- @CodableDefault.FirstCase public var stage: Stage
+ public var stage: Stage?
 
  /// Default region (default: us-east-1)
  @CodableDefault.FirstCase public var region: Region
@@ -316,13 +316,13 @@ extension Provider {
  /// - cors: Enable CORS HTTP headers with default settings (allow all)
  /// - authorizers: Authorizers
  public init(
- id: String?,
- name: String?,
+ id: String? = nil,
+ name: String? = nil,
  payload: String?,
- disableDefaultEndpoint: Bool?,
- metrics: Bool?,
+ disableDefaultEndpoint: Bool? = nil,
+ metrics: Bool? = nil,
  cors: Bool?,
- authorizers: Provider.Authorizers?
+ authorizers: Provider.Authorizers? = nil
  ) {
  self.id = id
  self.name = name
@@ -440,12 +440,12 @@ public struct Role: Codable, Equatable {
  /// - deploymentRole: ARN of an IAM role for CloudFormation service. If specified, CloudFormation uses the role's credentials
  public init(
  statements: [Statement],
- name: String?,
- path: String?,
- managedPolicies: [String]?,
- permissionsBoundary: String?,
- tags: [String: String]?,
- deploymentRole: String?
+ name: String? = nil,
+ path: String? = nil,
+ managedPolicies: [String]? = nil,
+ permissionsBoundary: String? = nil,
+ tags: [String: String]? = nil,
+ deploymentRole: String? = nil
  ) {
  self.statements = statements
  self.name = name

Sources/SwiftSlsAdapter/Resource.swift

@@ -16,58 +16,51 @@
 
 import Foundation
 
-// MARK: - ProductsTable
+public struct Resources {
+ /// Build Resources
+ /// - Parameter with: Resource dictionary
+ /// - Returns: [String: AnyHashable]
+ public static func resources(with dictionary: [String: [String: AnyHashable]]) -> [String: AnyHashable] {
+ return ["Resources": dictionary]
+ }
+}
 
-/// Resource configuration
-public struct Resource: Codable {
- /// Initialise a Resource configuration
+/// Resource builder
+public struct Resource {
+ /// Build a Resource
  ///
  /// - Parameters:
- /// - type: Resource type
- /// - properties: Resource YAML properties
- public init(type: String, properties: YAMLContent) {
- self.type = type
- self.properties = properties
+ /// - type: Type
+ /// - properties: Properties
+ /// - Returns: [String: AnyHashable]
+ public static func resource(type: String, properties: [String: AnyHashable]) -> [String: AnyHashable] {
+ return ["Type": type,
+ "Properties": properties]
  }
-
- /// Resource type
- public let type: String
 
- /// Resource YAML properties
- public let properties: YAMLContent
-
- enum CodingKeys: String, CodingKey {
- case type = "Type"
- case properties = "Properties"
- }
-}
-
-extension Resource {
  /// Build a DynamoDB Resource with billing mode PAY_PER_REQUEST
  ///
  /// - Parameters:
  /// - tableName: DynamoDB table name
  /// - key: DynamoDB key
- /// - Returns: Resource
- public static func DynamoDBResorce(tableName: String, key: String) throws -> Resource {
- return Resource(
+ /// - Returns: [String: AnyHashable]
+ public static func dynamoDBResource(tableName: String, key: String) -> [String: AnyHashable] {
+ return Resource.resource(
  type: "AWS::DynamoDB::Table",
- properties: try YAMLContent.DynamoDBProperties(tableName: tableName, key: key)
+ properties: Resource.dynamoDBProperties(tableName: tableName, key: key)
  )
  }
-}
 
-extension YAMLContent {
  /// DynamoDB YAML properties
  ///
  /// Billing mode PAY_PER_REQUEST
  /// see: https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BillingModeSummary.html
  /// - Parameters:
  /// - tableName: DynamoDB table name
  /// - key: DynamoDB key name
- /// - Returns: YAMLContent
- public static func DynamoDBProperties(tableName: String, key: String) throws -> YAMLContent {
- let properties: [String: AnyHashable] = [
+ /// - Returns: [String: AnyHashable]
+ public static func dynamoDBProperties(tableName: String, key: String) -> [String: AnyHashable] {
+ return [
  "TableName": tableName,
  "AttributeDefinitions": [
  "AttributeName": key,
@@ -79,6 +72,5 @@ extension YAMLContent {
  ],
  "BillingMode": "PAY_PER_REQUEST"
  ]
- return try YAMLContent(with: properties)
  }
 }

Sources/SwiftSlsAdapter/ServerlessConfig.swift

@@ -28,6 +28,7 @@ public struct ServerlessConfig: Codable, Equatable {
  ///
  /// - Parameters:
  /// - service: Service Name
+ /// - variablesResolutionMode: Variable resolution mode (default: 20210326)
  /// - frameworkVersion: Framework Version
  /// - configValidationMode: Configuration validation: 'error' (fatal error), 'warn' (logged to the output) or 'off' (default: warn)
  /// - useDotenv: Load environment variables from .env files (default: false)
@@ -39,6 +40,7 @@ public struct ServerlessConfig: Codable, Equatable {
  /// - resources: YAML Resources
  public init(
  service: String,
+ variablesResolutionMode: String = "20210326",
  frameworkVersion: String = "3",
  configValidationMode: ServerlessConfig.ValidationMode = .warn,
  useDotenv: Bool = false,
@@ -50,6 +52,7 @@ public struct ServerlessConfig: Codable, Equatable {
  resources: YAMLContent?
  ) {
  self.service = service
+ self.variablesResolutionMode = variablesResolutionMode
  self.frameworkVersion = frameworkVersion
  self.configValidationMode = configValidationMode
  self.useDotenv = useDotenv
@@ -63,6 +66,9 @@ public struct ServerlessConfig: Codable, Equatable {
 
  /// Service name
  public let service: String
+ 
+ /// Variable Resolution Mode
+ public let variablesResolutionMode: String
 
  /// Framework version constraint (semver constraint): '3', '^2.33'
  public let frameworkVersion: String