Merge pull request #9 from cloudify-incubator/0.1.2-build

bump version

Author: EarthmanT

.circleci/config.yml

@@ -27,13 +27,37 @@ executors:
       image: ubuntu-2004:202201-02
 
 commands:
+
+  setup_manager:
+    steps:
+      - run: |
+          if [[ -z "${CLOUDIFY_HOST}" ]]; then
+              exit 1
+          fi
+      - run: |
+          if [[ -z "${CLOUDIFY_TENANT}" ]]; then
+              exit 1
+          fi
+      - run: |
+          if [[ -z "${CLOUDIFY_TOKEN}" ]]; then
+              exit 1
+          fi
+      - run: |
+          response=$(curl --write-out '%{http_code}' --silent --insecure --header "Tenant: ${CLOUDIFY_TENANT}" --header "Authentication-Token: ${CLOUDIFY_TOKEN}" https://$CLOUDIFY_HOST/api/v3.1/status --output /dev/null)
+          if [[ $response != 200 ]]; then
+              echo "Failed to get manager status";
+              exit 1
+          fi
+      - run: pip3 install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/refs/heads/master.zip
+      - run: git submodule update --init --recursive --remote
+
   prepare_test_manager:
     steps:
-      - run: ecosystem-test prepare-test-manager -l $TEST_LICENSE -es aws_access_key_id=$aws_access_key_id -es aws_secret_access_key=$aws_secret_access_key --yum-package python-netaddr --yum-package git -p $(find ~/project/workspace/build/ -name *centos-Core*x86_64.wgn)  ~/project/plugin.yaml
+      - run: ecosystem-test prepare-remote-test-manager -es aws_access_key_id=$aws_access_key_id -es aws_secret_access_key=$aws_secret_access_key -p $(find ~/project/workspace/build/ -name *centos-Core*x86_64.wgn)  ~/project/plugin.yaml
 
   run_blueprint:
     steps:
-      - run: ecosystem-test local-blueprint-test -b examples/blueprint.yaml --test-id=hello-world-example --on-failure=uninstall-force --timeout=1800
+      - run: ecosystem-test remote-blueprint-test -b examples/blueprint.yaml --test-id=hello-world-example --on-failure=uninstall-force --timeout=1800
 
 jobs:
 
@@ -52,13 +76,19 @@ workflows:
   tests:
     jobs:
       - node/check_py3_compat_job
-      - node/unittests_job
+      - node/unittests_job:
+          context: 
+            - plugins-inputs
       - node/validate_version_job
       - node/validate_documentation_job
       - wagonorb/wagon:
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
+      - wagonorb/wagon_311:
+          filters:
+            branches:
+              only: /([0-9\.]*\-build|master)/
       - wagonorb/arch64_wagon:
           filters:
             branches:
@@ -68,25 +98,33 @@ workflows:
             branches:
               only: /([0-9\.]*\-build|master)/
       - integration_tests_py3:
+          context: 
+            - plugins-inputs
           requires:
             - wagonorb/wagon
+            - wagonorb/wagon_311
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
       - releaseorb/release:
+          context: 
+            - plugins-inputs
           filters:
             branches:
               only: /master/
           requires:
             - wagonorb/wagon
+            - wagonorb/wagon_311
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
             - node/validate_version_job
             - node/validate_documentation_job
             - integration_tests_py3
       - releaseorb/merge_docs_job:
+          context: 
+            - plugins-inputs
           filters:
             branches:
               only: /master/
@@ -104,11 +142,17 @@ workflows:
     jobs:
       - node/check_py3_compat_job
       - node/validate_version_job
-      - node/unittests_job
+      - node/unittests_job:
+          context: 
+            - plugins-inputs
       - wagonorb/wagon:
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
+      - wagonorb/wagon_311:
+          filters:
+            branches:
+              only: /([0-9\.]*\-build|master)/
       - wagonorb/arch64_wagon:
           filters:
             branches:
@@ -118,8 +162,11 @@ workflows:
             branches:
               only: /([0-9\.]*\-build|master)/
       - integration_tests_py3:
+          context: 
+            - plugins-inputs
           requires:
             - wagonorb/wagon
+            - wagonorb/wagon_311
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
           filters:

CHANGELOG.txt

@@ -1,3 +1,4 @@
 0.0.1: POC
 0.1.0: Productized release.
 0.1.1: add __version__.py file
+0.1.2: py311 wagon & remote manager & context.

plugin.yaml

@@ -1,109 +1,75 @@
 plugins:
-
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: '0.1.1'
-
+    package_version: 0.1.2
 data_types:
-
   cloudify.types.serverless.ServerlessConfig:
     properties:
       executable_path:
         type: string
         default: ''
-        description: File path to Serverless binary. Leave blank and Cloudify will store the binary.
-
   cloudify.types.serverless.ClientConfig:
     properties:
       provider:
         type: string
-        description: The Serverless provider name.
         required: false
       credentials:
-        # type: dict
+        type: dict
         required: false
-        description: Credentials of the provider.
-
   cloudify.types.serverless.ServiceConfig:
     properties:
       name:
         type: string
-        description: The Serverless service name.
         required: true
       template:
         type: string
-        description: Template for the service.
         required: true
       template_url:
         type: string
-        description: Template URL for the service. Supports GitHub, BitBucket.
         required: false
       template_path:
         type: string
-        description: Template local path for the service.
         required: false
       functions:
-        # type: list
+        type: list
         required: true
-        description: List of cloudify.types.serverless.FunctionConfig.
       env:
-        # type: dict
+        type: dict
         required: false
-        description: >
-          A dict of environment variables to use during execution of serverless CLI calls.
-        # For example, you can provide AWS credentials:
-        # env:
-        #   AWS_ACCESS_KEY_ID: { get_secret: AWS_ACCESS_KEY_ID }
-        #   AWS_SECRET_ACCESS_KEY: { get_secret: AWS_SECRET_ACCESS_KEY }
-
   cloudify.types.serverless.FunctionConfig:
     properties:
       name:
         type: string
-        description: The Serverless function name.
         required: true
       handler:
         type: string
-        description: The Serverless function handelr.
         required: true
       events:
-        # type: list
-        description: List of events assoicated with the function.
+        type: list
         required: false
       environment:
-        # type: dict
-        description: Function environment variables.
+        type: dict
         required: false
-
 dsl_definitions:
-
-  serverless_configuration: &serverless_config
-    serverless_config:
+  serverless_configuration:
+    serverless_config: &id001
       type: cloudify.types.serverless.ServerlessConfig
-
-  use_external_resource_desc: &use_external_resource_desc >
-    Indicate whether the resource exists or if Cloudify should create the resource,
-    true if you are bringing an existing resource, false if you want cloudify to create it.
-
-  external_resource: &external_resource
-    use_external_resource:
-      description: *use_external_resource_desc
+  use_external_resource_desc: >
+    Indicate whether the resource exists or if Cloudify should create the resource, true if you are bringing an existing resource, false if you want cloudify to create it.
+  external_resource:
+    use_external_resource: &id002
       type: boolean
       default: false
-
 node_types:
-
   cloudify.nodes.serverless.Binary:
     derived_from: cloudify.nodes.SoftwareComponent
     properties:
-      <<: *serverless_config
-      <<: *external_resource
+      serverless_config: *id001
+      use_external_resource: *id002
       installation_source:
         type: string
-        default: 'https://github.com/serverless/serverless/releases/download/v3.22.0/serverless-linux-x64'
-        description: >
-          Location to download the Helm installation from. Ignored if 'use_existing_resource' is true.
+        default: https://github.com/serverless/serverless/releases/download/v3.22.0/serverless-linux-x64
       max_sleep_time:
         type: integer
         default: 300
@@ -113,15 +79,13 @@ node_types:
           implementation: sl.serverless_plugin.tasks.install_binary
         delete:
           implementation: sl.serverless_plugin.tasks.uninstall_binary
-
   cloudify.nodes.serverless.Service:
     derived_from: cloudify.nodes.SoftwareComponent
     properties:
-      <<: *serverless_config
-      <<: *external_resource
+      serverless_config: *id001
+      use_external_resource: *id002
       client_config:
         type: cloudify.types.serverless.ClientConfig
-        description: Configure the Serverless provider and client credentials.
         required: true
       resource_config:
         type: cloudify.types.serverless.ServiceConfig

plugin_1_4.yaml

@@ -3,7 +3,7 @@ plugins:
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: '0.1.1'
+    package_version: '0.1.2'
 
 data_types:
 

serverless_plugin/__version__.py

@@ -1 +1 @@
-version = '0.1.1'
+version = '0.1.2'