1.9.6 build (#222)

* NE-10723-fix-circleci-config (#220)

* update setup manager urllib3==1.26.15 (#218)

* update to plugin_1_5.yaml

* update requirements.txt

* update requirements.txt

---------

Co-authored-by: Nely Nehemia <39059747+Nelynehemia@users.noreply.github.com>

.gitignore

@@ -46,3 +46,7 @@ cover
 # IDE
 .DS_Store
 *.wgn
+fusion-agent
+fusion-common
+fusion-manager
+cloudify-utilities-plugins-sdk

CHANGELOG.txt

@@ -1,4 +1,5 @@
-1.9.5: 
+1.9.6: Change requirements.
+1.9.5:
   - add remote manager & unique id to tests.
   - Support waiting until the resource is ready.
 1.9.4: updated circleci to use context for env variables.

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_gcp/__version__.py

@@ -1 +1 @@
-version = '1.9.5'
+version = '1.9.6'

extra-packaging-instructions.sh

@@ -6,5 +6,4 @@ then
 def get_doc(*args):
     return ''
 EOF
-    git apply python311.patch
 fi

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   gcp_plugin:
     executor: central_deployment_agent
     package_name: cloudify-gcp-plugin
-    package_version: 1.9.5
+    package_version: 1.9.6
 dsl_definitions:
   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.

plugin_1_4.yaml

@@ -2,7 +2,7 @@ plugins:
   gcp_plugin:
     executor: central_deployment_agent
     package_name: cloudify-gcp-plugin
-    package_version: 1.9.5
+    package_version: 1.9.6
 dsl_definitions:
   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.

plugin_1_5.yaml

@@ -3,7 +3,7 @@ plugins:
   gcp_plugin:
     executor: central_deployment_agent
     package_name: cloudify-gcp-plugin
-    package_version: 1.9.5
+    package_version: 1.9.6
     properties_description: Manage Azure resources.
     properties:
       auth:

requirements-3.6.in

@@ -0,0 +1,2 @@
+cryptography==40.0.2
+psutil==5.8.0

requirements-3.6.txt

@@ -0,0 +1,265 @@
+#
+# 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
+    #   jsonschema
+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-utilities-plugins-sdk
+botocore==1.26.10
+    # via
+    #   boto3
+    #   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-gcp-plugin (setup.py)
+    #   cloudify-utilities-plugins-sdk
+cloudify-utilities-plugins-sdk==0.0.130
+    # via cloudify-gcp-plugin (setup.py)
+cryptography==40.0.2
+    # via
+    #   -r requirements-3.6.in
+    #   adal
+    #   azure-identity
+    #   msal
+    #   paramiko
+    #   pyjwt
+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-api-core==2.8.2
+    # via google-api-python-client
+google-api-python-client==2.52.0
+    # via cloudify-gcp-plugin (setup.py)
+google-auth==2.15.0
+    # via
+    #   cloudify-gcp-plugin (setup.py)
+    #   cloudify-utilities-plugins-sdk
+    #   google-api-core
+    #   google-api-python-client
+    #   google-auth-httplib2
+    #   kubernetes
+google-auth-httplib2==0.1.1
+    # via google-api-python-client
+googleapis-common-protos==1.56.3
+    # via google-api-core
+httplib2==0.22.0
+    # via
+    #   cloudify-gcp-plugin (setup.py)
+    #   google-api-python-client
+    #   google-auth-httplib2
+    #   oauth2client
+idna==3.6
+    # via
+    #   idna-ssl
+    #   requests
+    #   yarl
+idna-ssl==1.1.0
+    # via aiohttp
+isodate==0.6.1
+    # via msrest
+jinja2==2.11.3
+    # via
+    #   cloudify-common
+    #   cloudify-utilities-plugins-sdk
+jmespath==0.10.0
+    # via
+    #   boto3
+    #   botocore
+jsonschema==3.0.0
+    # via cloudify-gcp-plugin (setup.py)
+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
+oauth2client==4.1.3
+    # via cloudify-gcp-plugin (setup.py)
+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
+protobuf==3.19.6
+    # via
+    #   google-api-core
+    #   googleapis-common-protos
+proxy_tools==0.1.0
+    # via cloudify-common
+psutil==5.8.0
+    # via
+    #   -r requirements-3.6.in
+    #   cloudify-utilities-plugins-sdk
+pyasn1==0.5.1
+    # via
+    #   oauth2client
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.3.0
+    # via
+    #   google-auth
+    #   oauth2client
+pycdlib==1.14.0
+    # via cloudify-utilities-plugins-sdk
+pycparser==2.21
+    # via cffi
+pycryptodome==3.9.9
+    # via cloudify-gcp-plugin (setup.py)
+pyjwt[crypto]==2.4.0
+    # via
+    #   adal
+    #   msal
+pynacl==1.5.0
+    # via paramiko
+pyparsing==3.0.7
+    # via
+    #   httplib2
+    #   packaging
+pyrsistent==0.18.0
+    # via jsonschema
+python-dateutil==2.8.2
+    # via
+    #   adal
+    #   botocore
+    #   kubernetes
+pytz==2021.3
+    # via cloudify-common
+pyyaml==6.0.1
+    # via
+    #   cloudify-utilities-plugins-sdk
+    #   kubernetes
+requests==2.27.1
+    # via
+    #   adal
+    #   azure-core
+    #   cloudify-common
+    #   cloudify-utilities-plugins-sdk
+    #   google-api-core
+    #   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
+    #   oauth2client
+s3transfer==0.5.2
+    # via boto3
+six==1.16.0
+    # via
+    #   azure-core
+    #   azure-identity
+    #   google-auth
+    #   isodate
+    #   jsonschema
+    #   kubernetes
+    #   msrestazure
+    #   oauth2client
+    #   python-dateutil
+    #   retrying
+smmap==5.0.0
+    # via gitdb
+typing-extensions==4.1.1
+    # via
+    #   aiohttp
+    #   azure-core
+    #   gitpython
+    #   yarl
+uritemplate==4.1.1
+    # via google-api-python-client
+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
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

requirements.in

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