Merge pull request #574 from cloudify-cosmo/3.2.2-build

3.2.2 build

.gitignore

@@ -100,3 +100,7 @@ local-storage/
 plugin_docs
 workspace
 *.wgn
+cloudify-utilities-plugins-sdk
+fusion-agent
+fusion-common
+fusion-manager

CHANGELOG.txt

@@ -1,3 +1,4 @@
+3.2.2: NE-10823-aws-VpnGatewayLimitExceeded.
 3.2.1: RND-1195 Add Subnet placement logic.
 3.2.0: Support ECR.
 3.1.9:

Makefile

@@ -0,0 +1,13 @@
+download:
+ifeq (,$(wildcard ./fusion-agent))
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout rel/magicp1-2.0.0 && cd ..
+endif
+ifeq (,$(wildcard ./fusion-common))
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout rel/magicp1-2.0.0 && cd ..
+endif
+ifeq (,$(wildcard ./fusion-manager))
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout rel/magicp1-2.0.0 && cd ..
+endif
+ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk))
+	git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd ..
+endif

cloudify_aws/__version__.py

@@ -1 +1 @@
-version = '3.2.1'
+version = '3.2.2'

cloudify_aws/ec2/resources/vpn_gateway.py

@@ -20,6 +20,7 @@
 from cloudify_aws.common import decorators, utils
 from cloudify_aws.ec2 import EC2Base
 from cloudify_aws.common.constants import EXTERNAL_RESOURCE_ID
+from cloudify_aws.common.utils import handle_response
 
 
 RESOURCE_TYPE = 'EC2 VPN Gateway'
@@ -124,7 +125,10 @@ def delete(iface, resource_config, dry_run=False, **_):
         vpn_gateway_id = iface.resource_id
 
     resource_config.update({VPNGATEWAY_ID: vpn_gateway_id})
-    iface.delete(resource_config)
+    handle_response(iface,
+                    'delete',
+                    resource_config,
+                    raise_substrings=['Incorrect State'])
 
 
 @decorators.aws_resource(EC2VPNGateway, RESOURCE_TYPE)

extra-packaging-instructions.sh

@@ -10,6 +10,4 @@ EOF
     touch ./webbrowser/__init__.py
     cat <<EOF > ./webbrowser/__init__.py
 EOF
-    git apply python311.patch
-    echo patch applied
 fi

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: 3.2.1
+    package_version: 3.2.2
 
 data_types:
   cloudify.datatypes.swift.Connection:

plugin_1_4.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: 3.2.1
+    package_version: 3.2.2
 
 data_types:
   cloudify.datatypes.swift.Connection:

plugin_1_5.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: '3.2.1'
+    package_version: '3.2.2'
     properties_description: |
       Manage AWS resources.
       Credentials documentation: https://docs.cloudify.co/latest/working_with/official_plugins/infrastructure/aws/#authentication-with-aws.

pydoc/__init__.py

@@ -0,0 +1,2 @@
+def get_doc(*args):
+    return ''

requirements-3.6.txt

@@ -0,0 +1,238 @@
+#
+# This file is autogenerated by pip-compile with python 3.6
+# To update, run:
+#
+#    pip-compile --no-emit-index-url --output-file=requirements-3.6.txt requirements-3.6.in setup.py
+#
+adal==1.2.7
+    # via msrestazure
+aiohttp==3.7.4.post0
+    # via cloudify-common
+async-timeout==3.0.1
+    # via aiohttp
+attrs==22.2.0
+    # via aiohttp
+azure-common==1.1.28
+    # via azure-mgmt-containerservice
+azure-core==1.24.2
+    # via
+    #   azure-identity
+    #   azure-mgmt-core
+    #   msrest
+azure-identity==1.10.0
+    # via cloudify-utilities-plugins-sdk
+azure-mgmt-containerservice==17.0.0
+    # via cloudify-utilities-plugins-sdk
+azure-mgmt-core==1.3.2
+    # via azure-mgmt-containerservice
+bcrypt==4.0.1
+    # via paramiko
+boto3==1.23.10
+    # via
+    #   cloudify-aws-plugin (setup.py)
+    #   cloudify-utilities-plugins-sdk
+botocore==1.26.10
+    # via
+    #   boto3
+    #   cloudify-aws-plugin (setup.py)
+    #   s3transfer
+bottle==0.12.19
+    # via cloudify-common
+cachetools==4.2.4
+    # via google-auth
+certifi==2023.11.17
+    # via
+    #   kubernetes
+    #   msrest
+    #   requests
+cffi==1.15.1
+    # via
+    #   cryptography
+    #   pynacl
+chardet==4.0.0
+    # via aiohttp
+charset-normalizer==2.0.12
+    # via requests
+cloudify-common==6.4.2.0
+    # via
+    #   cloudify-aws-plugin (setup.py)
+    #   cloudify-utilities-plugins-sdk
+cloudify-utilities-plugins-sdk==0.0.130
+    # via cloudify-aws-plugin (setup.py)
+cryptography==40.0.2
+    # via
+    #   adal
+    #   azure-identity
+    #   msal
+    #   paramiko
+    #   pyjwt
+datetime==4.9
+    # via cloudify-aws-plugin (setup.py)
+deepdiff==3.3.0
+    # via cloudify-aws-plugin (setup.py)
+fasteners==0.17.3
+    # via cloudify-common
+gitdb==4.0.8
+    # via
+    #   cloudify-utilities-plugins-sdk
+    #   gitpython
+gitpython==3.1.18
+    # via cloudify-utilities-plugins-sdk
+google-auth==2.15.0
+    # via
+    #   cloudify-utilities-plugins-sdk
+    #   kubernetes
+idna==3.6
+    # via
+    #   idna-ssl
+    #   requests
+    #   yarl
+idna-ssl==1.1.0
+    # via aiohttp
+importlib-metadata==4.8.3
+    # via jsonpickle
+isodate==0.6.1
+    # via msrest
+jinja2==2.11.3
+    # via
+    #   cloudify-common
+    #   cloudify-utilities-plugins-sdk
+jmespath==0.10.0
+    # via
+    #   boto3
+    #   botocore
+jsonpickle==2.2.0
+    # via deepdiff
+kubernetes==v26.1.0
+    # via cloudify-utilities-plugins-sdk
+markupsafe==2.0.1
+    # via jinja2
+msal==1.25.0
+    # via
+    #   azure-identity
+    #   msal-extensions
+msal-extensions==1.0.0
+    # via azure-identity
+msrest==0.7.1
+    # via
+    #   azure-mgmt-containerservice
+    #   msrestazure
+msrestazure==0.6.4
+    # via cloudify-utilities-plugins-sdk
+multidict==5.2.0
+    # via
+    #   aiohttp
+    #   yarl
+oauthlib==3.2.2
+    # via requests-oauthlib
+packaging==21.3
+    # via cloudify-utilities-plugins-sdk
+paramiko==3.3.1
+    # via cloudify-utilities-plugins-sdk
+pika==1.1.0
+    # via cloudify-common
+pkginfo==1.9.6
+    # via wagon
+portalocker==2.7.0
+    # via msal-extensions
+proxy_tools==0.1.0
+    # via cloudify-common
+psutil==5.9.6
+    # via cloudify-utilities-plugins-sdk
+pyasn1==0.5.1
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.3.0
+    # via google-auth
+pycdlib==1.14.0
+    # via cloudify-utilities-plugins-sdk
+pycparser==2.21
+    # via cffi
+pycryptodome==3.19.0
+    # via cloudify-aws-plugin (setup.py)
+pyjwt[crypto]==2.4.0
+    # via
+    #   adal
+    #   msal
+pynacl==1.5.0
+    # via paramiko
+pyparsing==3.0.7
+    # via packaging
+python-dateutil==2.8.2
+    # via
+    #   adal
+    #   botocore
+    #   kubernetes
+pytz==2021.3
+    # via
+    #   cloudify-common
+    #   datetime
+pyyaml==6.0.1
+    # via
+    #   cloudify-utilities-plugins-sdk
+    #   kubernetes
+requests==2.27.1
+    # via
+    #   adal
+    #   azure-core
+    #   cloudify-common
+    #   cloudify-utilities-plugins-sdk
+    #   kubernetes
+    #   msal
+    #   msrest
+    #   requests-oauthlib
+    #   requests-toolbelt
+requests-oauthlib==1.3.1
+    # via
+    #   kubernetes
+    #   msrest
+requests_toolbelt==0.9.1
+    # via cloudify-common
+retrying==1.3.3
+    # via cloudify-common
+rsa==4.9
+    # via google-auth
+s3transfer==0.5.2
+    # via boto3
+six==1.16.0
+    # via
+    #   azure-core
+    #   azure-identity
+    #   google-auth
+    #   isodate
+    #   kubernetes
+    #   msrestazure
+    #   python-dateutil
+    #   retrying
+smmap==5.0.0
+    # via gitdb
+typing-extensions==4.1.1
+    # via
+    #   aiohttp
+    #   azure-core
+    #   gitpython
+    #   importlib-metadata
+    #   yarl
+urllib3==1.26.18
+    # via
+    #   botocore
+    #   kubernetes
+    #   requests
+wagon==1.0.1
+    # via cloudify-common
+websocket-client==1.3.1
+    # via kubernetes
+wheel==0.37.1
+    # via wagon
+xmltodict==0.13.0
+    # via cloudify-utilities-plugins-sdk
+yarl==1.7.2
+    # via aiohttp
+zipp==3.6.0
+    # via importlib-metadata
+zope.interface==5.5.2
+    # via datetime
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

requirements.in

@@ -0,0 +1,5 @@
+-e fusion-common
+-e fusion-manager/mgmtworker
+-e fusion-agent
+-e cloudify-utilities-plugins-sdk
+cryptography>=41.0.5