Updating config details

README.md

@@ -27,14 +27,24 @@ Configure your account details in `~/.steampipe/config/btp.spc`:
 connection "btp" {
   plugin = "ajmaradiaga/btp"
 
-  # You will need to create a service key for the Cloud Management Service. 
+  # User email used to log in to SAP BTP. Required.
+  # This can also be set via the `BTP_USERNAME` environment variable.
+  # username = "[email protected]"
+
+  # User password used to log in to SAP BTP. Required.
+  # This can also be set via the `BTP_PASSWORD` environment variable.
+  # password = "My-BTP-Passw0rd"
+
+  # You will need to create a service key for the Cloud Management Service. Required.
   # You can get the instructions on how to get an access token for the SAP Cloud Management Service APIs here: https://help.sap.com/docs/btp/sap-business-technology-platform/getting-access-token-for-sap-cloud-management-service-apis.
+  # This can also be set via the `BTP_CIS_SERVICE_KEY_PATH` environment variable. Required.
+  # cis_service_key_path = "~/service_keys/cis_global.json"
 
-  # URL of the Accounts Service. Required.
+  # URL of the Accounts Service. Optional.
   # This can also be set via the `BTP_CIS_ACCOUNTS_SERVICE_URL` environment variable.
   # cis_accounts_service_url = "https://accounts-service.cfapps.[region].hana.ondemand.com"
   
-  # URL of the Entitlements Service. Required.
+  # URL of the Entitlements Service. Optional.
   # This can also be set via the `BTP_CIS_ENTITLEMENTS_SERVICE_URL` environment variable.
   # cis_entitlements_service_url = "https://entitlements-service.cfapps.[region].hana.ondemand.com"
 
@@ -59,20 +69,15 @@ connection "btp" {
   # The value in the service key doesn't contain the path, /oauth/token, if not specified the plugin will append it automatically.
   # This can also be set via the `BTP_CIS_TOKEN_URL` environment variable. Optional.
   # cis_token_url = "https://[global-account-subdomain].authentication.[region].hana.ondemand.com"
-
-  # User Email used to log in to SAP BTP.
-  # This can also be set via the `BTP_USERNAME` environment variable. Optional.
-  # username = "[email protected]"
-
-  # User Password used to log in to SAP BTP.
-  # This can also be set via the `BTP_PASSWORD` environment variable. Optional.
-  # password = "My-BTP-Passw0rd"
 }
 ```
 
 Or through environment variables:
 
 ```sh
+export [email protected]
+export BTP_PASSWORD=My-BTP-Passw0rd
+export BTP_CIS_SERVICE_KEY_PATH=~/service_keys/cis_global.json
 export BTP_CIS_ACCOUNTS_SERVICE_URL=https://accounts-service.cfapps.eu10.hana.ondemand.com
 export BTP_CIS_ENTITLEMENTS_SERVICE_URL=https://entitlements-service.cfapps.eu10.hana.ondemand.com
 export BTP_CIS_ACCESS_TOKEN=eyJhbGciOiDBNsO0JxFoAaodkDJ3Pmk7cFEsEr5ml5BwNWEafrEjy8Hsxt2mVACpD8B4AIPpRuMoGE71qXGoPcW0vCugceTwN4C3xM8qYmH7DLQ

config/btp.spc

@@ -43,15 +43,4 @@ connection "btp" {
   # The value in the service key doesn't contain the path, /oauth/token, if not specified the plugin will append it automatically.
   # This can also be set via the `BTP_CIS_TOKEN_URL` environment variable. Optional.
   # cis_token_url = "https://[global-account-subdomain].authentication.[region].hana.ondemand.com"
-<<<<<<< HEAD
-=======
-
-  # User Email used to log in to SAP BTP.
-  # This can also be set via the `BTP_USERNAME` environment variable. Optional.
-  # username = "[email protected]"
-
-  # User Password used to log in to SAP BTP.
-  # This can also be set via the `BTP_PASSWORD` environment variable. Optional.
-  # password = "My-BTP-Passw0rd"
->>>>>>> 2f53a7e (Including additional config supported)
 }

docs/index.md

@@ -116,17 +116,6 @@ connection "btp" {
   # The value in the service key doesn't contain the path, /oauth/token, if not specified the plugin will append it automatically.
   # This can also be set via the `BTP_CIS_TOKEN_URL` environment variable. Optional.
   # cis_token_url = "https://[global-account-subdomain].authentication.[region].hana.ondemand.com"
-<<<<<<< HEAD
-=======
-
-  # User Email used to log in to SAP BTP.
-  # This can also be set via the `BTP_USERNAME` environment variable. Optional.
-  # username = "[email protected]"
-
-  # User Password used to log in to SAP BTP.
-  # This can also be set via the `BTP_PASSWORD` environment variable. Optional.
-  # password = "My-BTP-Passw0rd"
->>>>>>> 2f53a7e (Including additional config supported)
 }
 ```