From ce859ed45450a4ddf439035085e4faa8ec79514c Mon Sep 17 00:00:00 2001
From: Srinivas Yeleti <syeleti@microsoft.com>
Date: Mon, 25 Nov 2024 13:20:37 +0530
Subject: [PATCH] Making Endpoint config flag optional on normal scenarios. It
 is only necessary if storage account is using a private endpoint.

---
 sampleBlockCacheConfig.yaml       |  1 -
 sampleFileCacheConfig.yaml        |  1 -
 sampleFileCacheWithSASConfig.yaml |  1 -
 sampleStreamingConfig.yaml        | 32 -------------------------------
 setup/advancedConfig.yaml         |  2 +-
 setup/baseConfig.yaml             |  2 +-
 6 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 sampleStreamingConfig.yaml

diff --git a/sampleBlockCacheConfig.yaml b/sampleBlockCacheConfig.yaml
index ec13fba0a..efddda03c 100644
--- a/sampleBlockCacheConfig.yaml
+++ b/sampleBlockCacheConfig.yaml
@@ -28,6 +28,5 @@ azstorage:
   type: block
   account-name: <ACCOUNT_NAME>
   account-key: <ACCOUNT_KEY>
-  endpoint: https://<ACCOUNT_NAME>.blob.core.windows.net
   mode: key
   container: <CONTAINER_NAME>
\ No newline at end of file
diff --git a/sampleFileCacheConfig.yaml b/sampleFileCacheConfig.yaml
index 41a6fd854..d9a32766b 100644
--- a/sampleFileCacheConfig.yaml
+++ b/sampleFileCacheConfig.yaml
@@ -27,6 +27,5 @@ azstorage:
   type: block
   account-name: <ACCOUNT_NAME>
   account-key: <ACCOUNT_KEY>
-  endpoint: https://<ACCOUNT_NAME>.blob.core.windows.net
   mode: key
   container: <CONTAINER_NAME>
\ No newline at end of file
diff --git a/sampleFileCacheWithSASConfig.yaml b/sampleFileCacheWithSASConfig.yaml
index dd79c59a0..b40f3ea17 100644
--- a/sampleFileCacheWithSASConfig.yaml
+++ b/sampleFileCacheWithSASConfig.yaml
@@ -27,7 +27,6 @@ azstorage:
   type: block
   account-name: <ACCOUNT_NAME>
   sas: <SAS_TOKEN>
-  endpoint: https://<ACCOUNT_NAME>.blob.core.windows.net
   mode: sas
   container: <CONTAINER_NAME>
  
\ No newline at end of file
diff --git a/sampleStreamingConfig.yaml b/sampleStreamingConfig.yaml
deleted file mode 100644
index e9ba4889c..000000000
--- a/sampleStreamingConfig.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Refer ./setup/baseConfig.yaml for full set of config parameters
-
-logging:
-  type: syslog
-  level: log_debug
-
-components:
-  - libfuse
-  - stream
-  - attr_cache
-  - azstorage
-
-libfuse:
-  attribute-expiration-sec: 120
-  entry-expiration-sec: 120
-  negative-entry-expiration-sec: 240
-
-stream:
-  block-size-mb: 8
-  max-buffers: 64
-  buffer-size-mb: 36
-
-attr_cache:
-  timeout-sec: 7200
-
-azstorage:
-  type: block
-  account-name: <ACCOUNT_NAME>
-  account-key: <ACCOUNT_KEY>
-  endpoint: https://<ACCOUNT_NAME>.blob.core.windows.net
-  mode: key
-  container: <CONTAINER_NAME>
\ No newline at end of file
diff --git a/setup/advancedConfig.yaml b/setup/advancedConfig.yaml
index 86518547b..25c787e17 100644
--- a/setup/advancedConfig.yaml
+++ b/setup/advancedConfig.yaml
@@ -112,7 +112,7 @@ azstorage:
   type: block|adls <type of storage account to be connected. Default - block>
   account-name: <name of the storage account>
   container: <name of the storage container to be mounted>
-  endpoint: <storage account endpoint (example - https://account-name.blob.core.windows.net)>
+  endpoint: <specify this parameter only if storage account is behind a private endpoint>
   mode: key|sas|spn|msi|azcli <kind of authentication to be used>
   account-key: <storage account key>
   # OR
diff --git a/setup/baseConfig.yaml b/setup/baseConfig.yaml
index a6ccef65d..6c2cb9cb8 100644
--- a/setup/baseConfig.yaml
+++ b/setup/baseConfig.yaml
@@ -36,7 +36,7 @@ azstorage:
   type: block|adls <type of storage account to be connected. Default - block>
   account-name: <name of the storage account>
   container: <name of the storage container to be mounted>
-  endpoint: <storage account endpoint (example - https://account-name.blob.core.windows.net)>
+  endpoint: <specify this parameter only if storage account is behind a private endpoint>
   mode: key|sas|spn|msi|azcli <kind of authentication to be used>
   account-key: <storage account key>
   # OR