chore: kickoff v1 release

Author: atierian

.circleci/config.yml

@@ -3,6 +3,7 @@
 version: 2.1
 
 orbs:
+  aws-cli: circleci/[email protected]
   # Using inline orb for now
   getting-started-smoke-test:
     orbs:
@@ -325,6 +326,46 @@ jobs:
           command: bundle exec fastlane << parameters.lane >>
           no_output_timeout: 60m
 
+  fortify_scan:
+    <<: *defaults
+    steps:
+      - *restore_repo
+      - run:
+          name: Make source directory
+          command: |
+            mkdir source
+            cp -r Amplify source
+            cp -r AmplifyPlugins source
+      - aws-cli/setup:
+          role-arn: 'arn:aws:iam::971028514469:role/CircleCiOIDC'
+          role-session-name: 'aws-s3-session'
+      - run:
+          name: Download License
+          command: |
+            aws s3 cp s3://amplify-swift-fortify-prod/fortify.license fortify.license
+      - run:
+          name: Download Installer
+          command: |
+            aws s3 cp s3://amplify-swift-fortify-prod/Fortify_SCA_and_Apps_22.1.1_Mac.tar.gz Fortify_SCA_and_Apps_22.1.1_Mac.tar.gz
+            tar -xvf Fortify_SCA_and_Apps_22.1.1_Mac.tar.gz
+            unzip Fortify_SCA_and_Apps_22.1.1_osx_x64.app.zip
+      - run:
+          name: Download Scripts
+          command: |
+            aws s3 cp s3://amplify-swift-fortify-prod/amplify_swift_fortify_scan.sh fortify_scan.sh
+      - run:
+          name: Run Installer
+          command: |
+            Fortify_SCA_and_Apps_22.1.1_osx_x64.app/Contents/MacOS/installbuilder.sh --mode unattended --installdir Fortify --InstallSamples 0  --fortify_license_path fortify.license --MigrateSCA 0
+            export PATH=~/amplify-swift/Fortify/bin:$PATH
+            echo "export PATH=~/amplify-swift/Fortify/bin:\$PATH" >> "$BASH_ENV"
+            fortifyupdate -acceptKey
+            sourceanalyzer -version
+      - run:
+          name: Run Scan
+          command: |
+            sh ./fortify_scan.sh source
+
 deploy_requires: &deploy_requires
   requires:
     - build_test_amplify
@@ -338,6 +379,7 @@ deploy_requires: &deploy_requires
     - unit_test_geo
     - unit_test_predictions
     - unit_test_storage
+    - fortify_scan
 
 workflows:
   build_test_deploy:
@@ -349,71 +391,76 @@ workflows:
       - install_gems:
           requires:
             - checkout_code
-      - build_test_amplify:
+      - fortify_scan:
+          context:
+            - amplify-swift-aws-s3-download
           requires:
             - install_gems
+      - build_test_amplify:
+          requires:
+            - fortify_scan
       - build_test_aws_plugins_core:
           requires:
-            - install_gems
+            - fortify_scan
       - build_amplify_spm:
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_analytics
           path: Analytics
           workspace: AnalyticsCategoryPlugin
           scheme: AWSPinpointAnalyticsPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_api
           path: API
           workspace: APICategoryPlugin
           scheme: AWSAPICategoryPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_auth
           path: Auth
           workspace: AWSCognitoAuthPlugin
           scheme: AWSCognitoAuthPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_datastore
           path: DataStore
           workspace: DataStoreCategoryPlugin
           scheme: AWSDataStoreCategoryPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_geo
           path: Geo
           workspace: GeoCategoryPlugin
           scheme: AWSLocationGeoPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_core_ml
           path: Predictions
           workspace: PredictionsCategoryPlugin
           scheme: CoreMLPredictionsPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_predictions
           path: Predictions
           workspace: PredictionsCategoryPlugin
           scheme: AWSPredictionsPlugin
           requires:
-            - install_gems
+            - fortify_scan
       - plugin_unit_test:
           name: unit_test_storage
           path: Storage
           workspace: StoragePlugin
           scheme: AWSS3StoragePlugin
           requires:
-            - install_gems
+            - fortify_scan
       - deploy:
           name: deploy unstable
           <<: *deploy_requires

.github/CODEOWNERS

@@ -1,16 +1 @@
 * @aws-amplify/amplify-ios 
-
-# This covers
-# - Amplify/Categories/DataStore/**
-# - Amplify/Categories/API/**
-# - AmplifyPlugins/DataStore/**
-# - AmplifyPlugins/API/**
-# - AmplifyPlugins/Core/AWSPuginsCore/**
-# - AmplifyTests/CategoryTests/DataStore/**
-# - AmplifyTestCommon/Models
-**/DataStore/**  @aws-amplify/amplify-data @aws-amplify/amplify-ios
-**/API/**  @aws-amplify/amplify-data @aws-amplify/amplify-ios
-**/Core/**  @aws-amplify/amplify-data @aws-amplify/amplify-ios
-/AmplifyTestCommon/Models/** @aws-amplify/amplify-data @aws-amplify/amplify-ios
-/.circleci @aws-amplify/amplify-data @aws-amplify/amplify-ios
-/.github @aws-amplify/amplify-data @aws-amplify/amplify-ios

AWSPluginsCore.podspec

@@ -8,7 +8,7 @@
 
 # Version definitions
 $AMPLIFY_VERSION = '1.29.0'
-$AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
+$AMPLIFY_RELEASE_TAG = "#{$AMPLIFY_VERSION}"
 
 $AWS_SDK_VERSION = '2.30.1'
 $OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"

AWSPredictionsPlugin.podspec

@@ -1,6 +1,6 @@
 # Version definitions
 $AMPLIFY_VERSION = '1.29.0'
-$AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
+$AMPLIFY_RELEASE_TAG = "#{$AMPLIFY_VERSION}"
 
 $AWS_SDK_VERSION = '2.30.1'
 $OPTIMISTIC_AWS_SDK_VERSION = "~> #{$AWS_SDK_VERSION}"

Amplify.podspec

@@ -8,7 +8,7 @@
 
 # Version definitions
 $AMPLIFY_VERSION = '1.29.0'
-$AMPLIFY_RELEASE_TAG = "v#{$AMPLIFY_VERSION}"
+$AMPLIFY_RELEASE_TAG = "#{$AMPLIFY_VERSION}"
 
 Pod::Spec.new do |s|
   s.name         = 'Amplify'

Amplify/Categories/API/Interceptor/URLRequestInterceptor.swift

@@ -19,6 +19,7 @@ import Foundation
 /// plugin.
 public protocol URLRequestInterceptor {
 
+    // swiftlint:disable:next todo
     // TODO: turn async https://github.com/aws-amplify/amplify-ios/issues/73
     /// Inspect and optionally modify the request, returning either the original
     /// unmodified request or a modified copy.

Amplify/Categories/API/Operation/GraphQLOperation.swift

@@ -12,7 +12,6 @@ open class GraphQLOperation<R: Decodable>: AmplifyOperation<
     APIError
 > { }
 
-
 /// GraphQL Subscription Operation
 open class GraphQLSubscriptionOperation<R: Decodable>: AmplifyInProcessReportingOperation<
     GraphQLOperationRequest<R>,

Amplify/Categories/API/Request/GraphQLOperationRequest.swift

@@ -46,7 +46,7 @@ public struct GraphQLOperationRequest<R: Decodable>: AmplifyOperationRequest {
     }
 }
 
-// MARK:  GraphQLOperationRequest + Options
+// MARK: GraphQLOperationRequest + Options
 public extension GraphQLOperationRequest {
     struct Options {
         public let pluginOptions: Any?

Amplify/Categories/API/Request/GraphQLRequest.swift

@@ -44,7 +44,6 @@ public struct GraphQLRequest<R: Decodable> {
     }
 }
 
-
 // MARK: GraphQLRequest + Options
 
 public extension GraphQLRequest {

Amplify/Categories/Auth/Request/AuthChangePasswordRequest.swift

@@ -32,6 +32,7 @@ public extension AuthChangePasswordRequest {
 
     struct Options {
 
+        // swiftlint:disable:next todo
         // TODO: Move this metadata to plugin options. All other request has the metadata
         // inside the plugin options.