revert eng files and modify test-resources.json for IT

Azure · Jul 2, 2020 · ada30a3 · ada30a3
1 parent 6d80a3e
commit ada30a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/sdk/cosmos/azure-spring-data-cosmosdb/src/test/resources/application.properties b/sdk/cosmos/azure-spring-data-cosmosdb/src/test/resources/application.properties
@@ -1,6 +1,6 @@
-cosmosdb.uri=${DOCUMENTDB_URI}
-cosmosdb.key=${DOCUMENTDB_KEY}
-cosmosdb.secondaryKey=${COSMOSDB_SECONDARY_KEY}
+cosmosdb.uri=${ACCOUNT_HOST}
+cosmosdb.key=${ACCOUNT_KEY}
+cosmosdb.secondaryKey=${SECONDARY_ACCOUNT_KEY}
 
 #You can also use connection string instead of uri and key to connect to cosmos DB
 #cosmosdb.connection-string=${DOCUMENTDB_CONNECTION_STRING}

diff --git a/sdk/cosmos/test-resources.json b/sdk/cosmos/test-resources.json
@@ -28,9 +28,7 @@
   "variables": {
     "apiVersion": "2020-04-01",
     "accountName": "[toLower(parameters('baseName'))]",
-    "accountName_spring_cosmos": "[concat(toLower(parameters('baseName')),'-spring-cosmos')]",
     "resourceId": "[resourceId('Microsoft.DocumentDB/databaseAccounts', variables('accountName'))]",
-    "resourceId_spring_cosmos": "[resourceId('Microsoft.DocumentDB/databaseAccounts', variables('accountName_spring_cosmos'))]",
     "singleRegionConfiguration": [
       {
         "locationName": "East US 2",
@@ -81,19 +79,6 @@
         "capabilities": [],
         "ipRules": []
       }
-    },
-    {
-      "type": "Microsoft.DocumentDB/databaseAccounts",
-      "apiVersion": "[variables('apiVersion')]",
-      "name": "[variables('accountName_spring_cosmos')]",
-      "kind": "GlobalDocumentDB",
-      "location": "[resourceGroup().location]",
-      "properties": {
-        "databaseAccountOfferType": "Standard",
-        "consistencyPolicy": {
-          "defaultConsistencyLevel": "Session"
-        }
-      }
     }
   ],
   "outputs": {
@@ -108,18 +93,6 @@
     "SECONDARY_ACCOUNT_KEY": {
       "type": "string",
       "value": "[listKeys(variables('resourceId'), variables('apiVersion')).secondaryMasterKey]"
-    },
-    "DOCUMENTDB_KEY": {
-      "type": "string",
-      "value": "[listKeys(variables('resourceId_spring_cosmos'), variables('apiVersion')).primaryMasterKey]"
-    },
-    "COSMOSDB_SECONDARY_KEY": {
-      "type": "string",
-      "value": "[listKeys(variables('resourceId_spring_cosmos'), variables('apiVersion')).secondaryMasterKey]"
-    },
-    "DOCUMENTDB_URI": {
-      "type": "string",
-      "value": "[reference(variables('resourceId_spring_cosmos'), variables('apiVersion')).documentEndpoint]"
     }
   }
 }