1 files changed, 11 insertions, 8 deletions
diff --git a/zenserver/upstream/jupiter.h b/zenserver/upstream/jupiter.h
index 61d1bd99c..ba5e0a65a 100644
--- a/zenserver/upstream/jupiter.h
+++ b/zenserver/upstream/jupiter.h
@@ -78,24 +78,28 @@ private:
 	detail::CloudCacheSessionState* m_SessionState;
 };
 
+struct CloudCacheClientOptions
+{
+	std::string_view ServiceUrl;
+	std::string_view DdcNamespace;
+	std::string_view BlobStoreNamespace;
+	std::string_view OAuthProvider;
+	std::string_view OAuthClientId;
+	std::string_view OAuthSecret;
+};
+
 /**
  * Jupiter upstream cache client
  */
 class CloudCacheClient : public RefCounted
 {
 public:
-	CloudCacheClient(std::string_view ServiceUrl,
-					 std::string_view DdcNamespace,
-					 std::string_view BlobStoreNamespace,
-					 std::string_view OAuthProvider,
-					 std::string_view OAuthClientId,
-					 std::string_view OAuthSecret);
+	CloudCacheClient(const CloudCacheClientOptions& Options);
 	~CloudCacheClient();
 
 	bool			 AcquireAccessToken(std::string& AuthorizationHeaderValue);
 	std::string_view DdcNamespace() const { return m_DdcNamespace; }
 	std::string_view BlobStoreNamespace() const { return m_BlobStoreNamespace; }
-	std::string_view DefaultBucket() const { return m_DefaultBucket; }
 	std::string_view ServiceUrl() const { return m_ServiceUrl; }
 	bool			 IsValid() const { return m_IsValid; }
 
@@ -109,7 +113,6 @@ private:
 	std::string			  m_OAuthFullUri;
 	std::string			  m_DdcNamespace;
 	std::string			  m_BlobStoreNamespace;
-	std::string			  m_DefaultBucket;
 	std::string			  m_OAuthClientId;
 	std::string			  m_OAuthSecret;
 	CloudCacheAccessToken m_AccessToken;