bump major version of generic shell and organize attributes

Author: katzy687

shells/generic_terraform_service/shell-definition.yaml

@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0
 metadata:
   template_name: Generic Terraform Service
   template_author: Quali CS
-  template_version: 1.0.0
+  template_version: 2.0.0
   template_icon: shell-icon.png
 
 description: >
@@ -15,24 +15,20 @@ node_types:
   vendor.resource.Generic Terraform Service:
     derived_from: cloudshell.nodes.CustomService
     properties:
-      # can delete? or leave for data model backwards compatibility?
+      # DEPRECATED - leave for data model backwards compatibility?
       Github Terraform Module URL:
-        description: "Github url to the Terraform module. Supports the same URL format from a browser. The entire repo will be downloaded. Url to a folder: https://github.com/ACCOUNT/REPO/tree/BRANCH/PATH_TO_FOLDER or url to a TF file: https://github.com/ACCOUNT/REPO/blob/BRANCH/PATH/filename.tf"
+        description: DEPRECATED - leave on data model with no user input tag
         type: string
         tags: [ ]
+      # DEPRECATED - leave for data model backwards compatibility?
+      Github Token:
+        description: DEPRECATED - leave on data model with no user input tag
+        type: cloudshell.datatypes.Password
+        tags: [ ]
       Git Terraform Module URL:
         description: "Git url to the Terraform module. Supports the same URL format from a browser. For Github, the entire repo will be downloaded. Url to a folder: https://github.com/ACCOUNT/REPO/tree/BRANCH/PATH_TO_FOLDER or url to a TF file: https://github.com/ACCOUNT/REPO/blob/BRANCH/PATH/filename.tf. Gitlab: 'http://<GITLAB_DOMAIN>/<USER>/<PROJECT_NAME>/-/tree/<BRANCH>/<FOLDER_PATH>'"
         type: string
         tags: [ user_input ]
-      Terraform Version:
-        description: The version of terraform needed (empty=latest). E.g. '1.0.0'
-        type: string
-        tags: [ user_input ]
-      # can delete? or leave for data model backwards compatibility?
-      Github Token:
-        description: Github Token
-        type: cloudshell.datatypes.Password
-        tags: [ ]
       Git Token:
         description: Git Token
         type: cloudshell.datatypes.Password
@@ -44,8 +40,12 @@ node_types:
           - valid_values: [github, gitlab]
         default: github
         tags: [ user_input ]
+      Terraform Version:
+        description: The version of terraform needed (empty=latest). E.g. '1.0.0'
+        type: string
+        tags: [ user_input ]
       Local Terraform:
-        description: Path on Execution Server to terraform.exe
+        description: Path on Execution Server to terraform.exe. Populate this for offline use.
         type: string
         tags: [ user_input ]
       Cloud Provider: