Merge pull request #10 from cloudify-incubator/0.1.3-build

republish manylinux and 1.5 DSL

Author: EarthmanT

.circleci/config.yml

@@ -48,16 +48,19 @@ commands:
               echo "Failed to get manager status";
               exit 1
           fi
+      - run: pip3 install urllib3==1.26.15 requests-toolbelt==0.10.1
       - 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-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: 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 *manylinux-py311-none-linux_x86_64.wgn*) ~/project/plugin_1_5.yaml
+      - run: ecosystem-test remote-upload-plugin -PN kubernetes --wagon-type manylinux
+      - run: ecosystem-test remote-upload-plugin -PN helm --wagon-type manylinux
 
   run_blueprint:
     steps:
-      - run: ecosystem-test remote-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=hwe$CIRCLE_BUILD_NUM --on-failure=uninstall-force --timeout=1800
 
 jobs:
 
@@ -67,7 +70,9 @@ jobs:
       CLOUDIFY_SSL_TRUST_ALL: true
     steps:
       - checkout
-      - managerorb/create_manager_container_latest
+      - attach_workspace:
+          at: workspace
+      - setup_manager
       - prepare_test_manager
       - run_blueprint
 
@@ -101,10 +106,7 @@ workflows:
           context: 
             - plugins-inputs
           requires:
-            - wagonorb/wagon
             - wagonorb/wagon_311
-            - wagonorb/arch64_wagon
-            - wagonorb/rhel_wagon
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
@@ -145,30 +147,15 @@ workflows:
       - 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:
-              only: /([0-9\.]*\-build|master|dev)/
-      - wagonorb/rhel_wagon:
-          filters:
-            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)/

CHANGELOG.txt

@@ -2,3 +2,4 @@
 0.1.0: Productized release.
 0.1.1: add __version__.py file
 0.1.2: py311 wagon & remote manager & context.
+0.1.3: Rerelease py311.

examples/blueprint.yaml

@@ -1,7 +1,7 @@
-tosca_definitions_version: cloudify_dsl_1_4
+tosca_definitions_version: cloudify_dsl_1_5
 
 imports:
-  - https://cloudify.co/spec/cloudify/6.4.0/types.yaml
+  - cloudify/types/types.yaml
   - plugin:cloudify-serverless-plugin
 
 node_templates:

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: 0.1.2
+    package_version: 0.1.3
 data_types:
   cloudify.types.serverless.ServerlessConfig:
     properties:

plugin_1_4.yaml

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

plugin_1_5.yaml

@@ -0,0 +1,163 @@
+plugins:
+
+  sl:
+    executor: central_deployment_agent
+    package_name: cloudify-serverless-plugin
+    package_version: '0.1.3'
+
+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
+        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
+        required: true
+        description: List of cloudify.types.serverless.FunctionConfig.
+      env:
+        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.
+        required: false
+      environment:
+        type: dict
+        description: Function environment variables.
+        required: false
+
+dsl_definitions:
+
+  serverless_configuration: &serverless_config
+    serverless_config:
+      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
+      type: boolean
+      default: false
+
+node_types:
+
+  cloudify.nodes.serverless.Binary:
+    derived_from: cloudify.nodes.SoftwareComponent
+    properties:
+      <<: *serverless_config
+      <<: *external_resource
+      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.
+      max_sleep_time:
+        type: integer
+        default: 300
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          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
+      client_config:
+        type: cloudify.types.serverless.ClientConfig
+        description: Configure the Serverless provider and client credentials.
+        required: true
+      resource_config:
+        type: cloudify.types.serverless.ServiceConfig
+        required: true
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          implementation: sl.serverless_plugin.tasks.create
+        configure:
+          implementation: sl.serverless_plugin.tasks.configure
+        start:
+          implementation: sl.serverless_plugin.tasks.start
+        poststart:
+          implementation: sl.serverless_plugin.tasks.poststart
+        stop:
+          implementation: sl.serverless_plugin.tasks.stop
+        delete:
+          implementation: sl.serverless_plugin.tasks.delete
+      serverless.interface:
+        invoke:
+          implementation: sl.serverless_plugin.tasks.invoke
+          inputs:
+            functions:
+              default: []
+        metrics:
+          implementation: sl.serverless_plugin.tasks.metrics
+          inputs:
+            functions:
+              default: []
+
+blueprint_labels:
+  obj-type:
+    values:
+      - serverless
+
+labels:
+  obj-type:
+    values:
+      - serverless

serverless_plugin/__version__.py

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

v2_plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: 0.1.2
+    package_version: 0.1.3
 data_types:
   cloudify.types.serverless.ServerlessConfig:
     properties: