Remove RUPM (#328)

Remove all RUPM code
2025-12-19 17:01:13 +00:00 · 2020-11-30 23:06:38 -08:00
parent 04ab1f3918
commit fd60c9c15e
19 changed files with 49 additions and 234 deletions
--- a/src/Explorer/Controls/FeaturePanel/FeaturePanelComponent.tsx
+++ b/src/Explorer/Controls/FeaturePanel/FeaturePanelComponent.tsx
@@ -44,7 +44,6 @@ export const FeaturePanelComponent: React.FunctionComponent = () => {
    onChange?: (_?: React.FormEvent<HTMLElement | HTMLInputElement>, checked?: boolean) => void;
  }[] = [
    { key: "feature.enablechangefeedpolicy", label: "Enable change feed policy", value: "true" },
-    { key: "feature.enablerupm", label: "Enable RUPM", value: "true" },
    { key: "feature.dataexplorerexecutesproc", label: "Execute stored procedure", value: "true" },
    { key: "feature.hosteddataexplorerenabled", label: "Hosted Data Explorer (deprecated?)", value: "true" },
    { key: "feature.enablettl", label: "Enable TTL", value: "true" },
--- a/src/Explorer/Controls/FeaturePanel/snapshots/FeaturePanelComponent.test.tsx.snap
+++ b/src/Explorer/Controls/FeaturePanel/snapshots/FeaturePanelComponent.test.tsx.snap
@@ -131,12 +131,6 @@ exports[`Feature panel renders all flags 1`] = `
          label="Enable change feed policy"
          onChange={[Function]}
        />
-        <StyledCheckboxBase
-          checked={false}
-          key="feature.enablerupm"
-          label="Enable RUPM"
-          onChange={[Function]}
-        />
        <StyledCheckboxBase
          checked={false}
          key="feature.dataexplorerexecutesproc"
--- a/src/Explorer/Controls/Settings/SettingsRenderUtils.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsRenderUtils.test.tsx
@@ -31,7 +31,7 @@ class SettingsRenderUtilsTestComponent extends React.Component {
        {getAutoPilotV3SpendElement(1000, true)}
        {getAutoPilotV3SpendElement(undefined, true)}

-        {getEstimatedSpendElement(1000, "mooncake", 2, false, true)}
+        {getEstimatedSpendElement(1000, "mooncake", 2, false)}

        {getEstimatedAutoscaleSpendElement(1000, "mooncake", 2, false)}

--- a/src/Explorer/Controls/Settings/SettingsRenderUtils.tsx
+++ b/src/Explorer/Controls/Settings/SettingsRenderUtils.tsx
@@ -199,10 +199,9 @@ export const getEstimatedSpendElement = (
  throughput: number,
  serverId: string,
  regions: number,
-  multimaster: boolean,
-  rupmEnabled: boolean
+  multimaster: boolean
 ): JSX.Element => {
-  const hourlyPrice: number = computeRUUsagePriceHourly(serverId, rupmEnabled, throughput, regions, multimaster);
+  const hourlyPrice: number = computeRUUsagePriceHourly(serverId, throughput, regions, multimaster);
  const dailyPrice: number = hourlyPrice * 24;
  const monthlyPrice: number = hourlyPrice * hoursInAMonth;
  const currency: string = getPriceCurrency(serverId);
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -179,8 +179,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
        this.overrideWithAutoPilotSettings() ? this.props.maxAutoPilotThroughput : offerThroughput,
        serverId,
        regions,
-        multimaster,
-        false
+        multimaster
      );
    } else {
      estimatedSpend = getEstimatedAutoscaleSpendElement(
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -133,8 +133,6 @@ exports[`SettingsComponent renders 1`] = `
                    "partitionKeyVisible": [Function],
                    "requestUnitsUsageCost": [Function],
                    "ruToolTipText": [Function],
-                    "rupm": [Function],
-                    "rupmVisible": [Function],
                    "sharedAutoPilotThroughput": [Function],
                    "sharedThroughputRangeText": [Function],
                    "shouldCreateMongoWildcardIndex": [Function],
@@ -622,8 +620,6 @@ exports[`SettingsComponent renders 1`] = `
                  "partitionKeyVisible": [Function],
                  "requestUnitsUsageCost": [Function],
                  "ruToolTipText": [Function],
-                  "rupm": [Function],
-                  "rupmVisible": [Function],
                  "sharedAutoPilotThroughput": [Function],
                  "sharedThroughputRangeText": [Function],
                  "shouldCreateMongoWildcardIndex": [Function],
@@ -1412,8 +1408,6 @@ exports[`SettingsComponent renders 1`] = `
                  "partitionKeyVisible": [Function],
                  "requestUnitsUsageCost": [Function],
                  "ruToolTipText": [Function],
-                  "rupm": [Function],
-                  "rupmVisible": [Function],
                  "sharedAutoPilotThroughput": [Function],
                  "sharedThroughputRangeText": [Function],
                  "shouldCreateMongoWildcardIndex": [Function],
@@ -1901,8 +1895,6 @@ exports[`SettingsComponent renders 1`] = `
                "partitionKeyVisible": [Function],
                "requestUnitsUsageCost": [Function],
                "ruToolTipText": [Function],
-                "rupm": [Function],
-                "rupmVisible": [Function],
                "sharedAutoPilotThroughput": [Function],
                "sharedThroughputRangeText": [Function],
                "shouldCreateMongoWildcardIndex": [Function],
@@ -2704,8 +2696,6 @@ exports[`SettingsComponent renders 1`] = `
                    "partitionKeyVisible": [Function],
                    "requestUnitsUsageCost": [Function],
                    "ruToolTipText": [Function],
-                    "rupm": [Function],
-                    "rupmVisible": [Function],
                    "sharedAutoPilotThroughput": [Function],
                    "sharedThroughputRangeText": [Function],
                    "shouldCreateMongoWildcardIndex": [Function],
@@ -3193,8 +3183,6 @@ exports[`SettingsComponent renders 1`] = `
                  "partitionKeyVisible": [Function],
                  "requestUnitsUsageCost": [Function],
                  "ruToolTipText": [Function],
-                  "rupm": [Function],
-                  "rupmVisible": [Function],
                  "sharedAutoPilotThroughput": [Function],
                  "sharedThroughputRangeText": [Function],
                  "shouldCreateMongoWildcardIndex": [Function],
@@ -3983,8 +3971,6 @@ exports[`SettingsComponent renders 1`] = `
                  "partitionKeyVisible": [Function],
                  "requestUnitsUsageCost": [Function],
                  "ruToolTipText": [Function],
-                  "rupm": [Function],
-                  "rupmVisible": [Function],
                  "sharedAutoPilotThroughput": [Function],
                  "sharedThroughputRangeText": [Function],
                  "shouldCreateMongoWildcardIndex": [Function],
@@ -4472,8 +4458,6 @@ exports[`SettingsComponent renders 1`] = `
                "partitionKeyVisible": [Function],
                "requestUnitsUsageCost": [Function],
                "ruToolTipText": [Function],
-                "rupm": [Function],
-                "rupmVisible": [Function],
                "sharedAutoPilotThroughput": [Function],
                "sharedThroughputRangeText": [Function],
                "shouldCreateMongoWildcardIndex": [Function],
--- a/src/Explorer/Controls/Settings/snapshots/SettingsRenderUtils.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsRenderUtils.test.tsx.snap
@@ -69,15 +69,15 @@ exports[`SettingsUtils functions render 1`] = `
     
    <b>
      ¥
-      1.29
+      1.02
       hourly 
       / 
      ¥
-      31.06
+      24.48
       daily 
       / 
      ¥
-      944.60
+      744.60
       monthly
       
    </b>
--- a/src/Explorer/Panes/AddCollectionPane.html
+++ b/src/Explorer/Panes/AddCollectionPane.html
@@ -243,38 +243,6 @@
          </div>
          <!-- Unlimited Button Content - Start -->
          <div class="tabcontent" data-bind="visible: isUnlimitedStorageSelected() || databaseHasSharedOffer()">
-              <div data-bind="visible: rupmVisible">
-                  <div class="tabs">
-                      <p>
-                          <span class="mandatoryStar">*</span>
-                          <span class="addCollectionLabel">RU/m</span>
-                          <span class="infoTooltip" role="tooltip" tabindex="0">
-                              <img class="infoImg" src="/info-bubble.svg" alt="More information">
-                              <span class="tooltiptext throughputRuInfo">
-                                  For each 100 Request Units per second (RU/s) provisioned, 1,000 Request Units
-                                  per
-                                  minute
-                                  (RU/m) can be provisioned. E.g.: for a container with 5,000 RU/s provisioned
-                                  with
-                                  RU/m
-                                  enabled, the RU/m budget will be 50,000 RU/m.
-                              </span>
-                          </span>
-                      </p>
-                      <div tabindex="0" data-bind="event: { keydown: onRupmOptionsKeyDown }" aria-label="RU/m">
-                          <div class="tab">
-                              <input type="radio" id="rupmOn2" name="rupmcoll2" value="on" class="radio"
-                                  data-bind="checked: rupm">
-                              <label for="rupmOn2">ON</label>
-                          </div>
-                          <div class="tab">
-                              <input type="radio" id="rupmOff2" name="rupmcoll2" value="off" class="radio"
-                                  data-bind="checked: rupm">
-                              <label for="rupmOff2">OFF</label>
-                          </div>
-                      </div>
-                  </div>
-              </div>
              <div data-bind="visible: partitionKeyVisible">
                  <p>
                      <span class="mandatoryStar">*</span>
--- a/src/Explorer/Panes/AddCollectionPane.ts
+++ b/src/Explorer/Panes/AddCollectionPane.ts
@@ -42,8 +42,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
  public partitionKeyVisible: ko.Computed<boolean>;
  public partitionKeyPattern: ko.Computed<string>;
  public partitionKeyTitle: ko.Computed<string>;
-  public rupm: ko.Observable<string>;
-  public rupmVisible: ko.Observable<boolean>;
  public storage: ko.Observable<string>;
  public throughputSinglePartition: ViewModels.Editable<number>;
  public throughputMultiPartition: ViewModels.Editable<number>;
@@ -143,12 +141,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
      }
      return "";
    });
-    this.rupm = ko.observable<string>(Constants.RUPMStates.off);
-    this.rupmVisible = ko.observable<boolean>(false);
-    const featureSubcription = this.container.features.subscribe(() => {
-      this.rupmVisible(this.container.isFeatureEnabled(Constants.Features.enableRupm));
-      featureSubcription.dispose();
-    });

    this.canExceedMaximumValue = ko.pureComputed(() => this.container.canExceedMaximumValue());

@@ -201,7 +193,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
          account.properties.readLocations.length) ||
        1;
      const multimaster = (account && account.properties && account.properties.enableMultipleWriteLocations) || false;
-      const rupmEnabled: boolean = this.rupm() === Constants.RUPMStates.on;

      let throughputSpendAckText: string;
      let estimatedSpend: string;
@@ -211,23 +202,15 @@ export default class AddCollectionPane extends ContextualPaneBase {
          serverId,
          regions,
          multimaster,
-          rupmEnabled,
          this.isSharedAutoPilotSelected()
        );
-        estimatedSpend = PricingUtils.getEstimatedSpendHtml(
-          offerThroughput,
-          serverId,
-          regions,
-          multimaster,
-          rupmEnabled
-        );
+        estimatedSpend = PricingUtils.getEstimatedSpendHtml(offerThroughput, serverId, regions, multimaster);
      } else {
        throughputSpendAckText = PricingUtils.getEstimatedSpendAcknowledgeString(
          this.sharedAutoPilotThroughput(),
          serverId,
          regions,
          multimaster,
-          rupmEnabled,
          this.isSharedAutoPilotSelected()
        );
        estimatedSpend = PricingUtils.getEstimatedAutoscaleSpendHtml(
@@ -264,7 +247,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
          account.properties.readLocations.length) ||
        1;
      const multimaster = (account && account.properties && account.properties.enableMultipleWriteLocations) || false;
-      const rupmEnabled: boolean = this.rupm() === Constants.RUPMStates.on;

      let throughputSpendAckText: string;
      let estimatedSpend: string;
@@ -274,15 +256,13 @@ export default class AddCollectionPane extends ContextualPaneBase {
          serverId,
          regions,
          multimaster,
-          rupmEnabled,
          this.isAutoPilotSelected()
        );
        estimatedSpend = PricingUtils.getEstimatedSpendHtml(
          this.throughputMultiPartition(),
          serverId,
          regions,
-          multimaster,
-          rupmEnabled
+          multimaster
        );
      } else {
        throughputSpendAckText = PricingUtils.getEstimatedSpendAcknowledgeString(
@@ -290,7 +270,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
          serverId,
          regions,
          multimaster,
-          rupmEnabled,
          this.isAutoPilotSelected()
        );
        estimatedSpend = PricingUtils.getEstimatedAutoscaleSpendHtml(
@@ -686,8 +665,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
        storage: this.storage(),
        offerThroughput: this._getThroughput(),
        partitionKey: this.partitionKey(),
-        databaseId: this.databaseId(),
-        rupm: this.rupm()
+        databaseId: this.databaseId()
      }),
      subscriptionType: SubscriptionType[this.container.subscriptionType()],
      subscriptionQuotaId: this.container.quotaId(),
@@ -788,7 +766,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
        id: this.collectionId(),
        storage: this.storage(),
        partitionKey,
-        rupm: this.rupm(),
        uniqueKeyPolicy,
        collectionWithThroughputInShared: this.collectionWithThroughputInShared()
      }),
@@ -863,7 +840,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
            id: this.collectionId(),
            storage: this.storage(),
            partitionKey,
-            rupm: this.rupm(),
            uniqueKeyPolicy,
            collectionWithThroughputInShared: this.collectionWithThroughputInShared()
          }),
@@ -898,7 +874,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
            id: this.collectionId(),
            storage: this.storage(),
            partitionKey,
-            rupm: this.rupm(),
            uniqueKeyPolicy,
            collectionWithThroughputInShared: this.collectionWithThroughputInShared()
          },
@@ -981,20 +956,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
    return true;
  }

-  public onRupmOptionsKeyDown(source: any, event: KeyboardEvent): boolean {
-    if (event.key === "ArrowRight") {
-      this.rupm("off");
-      return false;
-    }
-
-    if (event.key === "ArrowLeft") {
-      this.rupm("on");
-      return false;
-    }
-
-    return true;
-  }
-
  public onEnableSynapseLinkButtonClicked() {
    this.container.openEnableSynapseLinkDialog();
  }
@@ -1018,16 +979,6 @@ export default class AddCollectionPane extends ContextualPaneBase {
    }

    const throughput = this._getThroughput();
-    const maxThroughputWithRUPM =
-      SharedConstants.CollectionCreation.MaxRUPMPerPartition * this._calculateNumberOfPartitions();
-
-    if (this.rupm() === Constants.RUPMStates.on && throughput > maxThroughputWithRUPM) {
-      this.formErrors(
-        `The maximum supported provisioned throughput with RU/m enabled is ${maxThroughputWithRUPM} RU/s. Please turn off RU/m to incease thoughput above ${maxThroughputWithRUPM} RU/s.`
-      );
-      return false;
-    }
-
    if (throughput > SharedConstants.CollectionCreation.DefaultCollectionRUs100K && !this.throughputSpendAck()) {
      this.formErrors(`Please acknowledge the estimated daily spend.`);
      return false;
--- a/src/Explorer/Panes/AddDatabasePane.ts
+++ b/src/Explorer/Panes/AddDatabasePane.ts
@@ -133,19 +133,12 @@ export default class AddDatabasePane extends ContextualPaneBase {
      let estimatedSpendAcknowledge: string;
      let estimatedSpend: string;
      if (!this.isAutoPilotSelected()) {
-        estimatedSpend = PricingUtils.getEstimatedSpendHtml(
-          offerThroughput,
-          serverId,
-          regions,
-          multimaster,
-          false /*rupmEnabled*/
-        );
+        estimatedSpend = PricingUtils.getEstimatedSpendHtml(offerThroughput, serverId, regions, multimaster);
        estimatedSpendAcknowledge = PricingUtils.getEstimatedSpendAcknowledgeString(
          offerThroughput,
          serverId,
          regions,
          multimaster,
-          false /*rupmEnabled*/,
          this.isAutoPilotSelected()
        );
      } else {
@@ -160,7 +153,6 @@ export default class AddDatabasePane extends ContextualPaneBase {
          serverId,
          regions,
          multimaster,
-          false /*rupmEnabled*/,
          this.isAutoPilotSelected()
        );
      }
--- a/src/Explorer/Panes/CassandraAddCollectionPane.ts
+++ b/src/Explorer/Panes/CassandraAddCollectionPane.ts
@@ -138,19 +138,12 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
      let estimatedSpend: string;
      let estimatedDedicatedSpendAcknowledge: string;
      if (!this.isAutoPilotSelected()) {
-        estimatedSpend = PricingUtils.getEstimatedSpendHtml(
-          offerThroughput,
-          serverId,
-          regions,
-          multimaster,
-          false /*rupmEnabled*/
-        );
+        estimatedSpend = PricingUtils.getEstimatedSpendHtml(offerThroughput, serverId, regions, multimaster);
        estimatedDedicatedSpendAcknowledge = PricingUtils.getEstimatedSpendAcknowledgeString(
          offerThroughput,
          serverId,
          regions,
          multimaster,
-          false /*rupmEnabled*/,
          this.isAutoPilotSelected()
        );
      } else {
@@ -165,7 +158,6 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
          serverId,
          regions,
          multimaster,
-          false /*rupmEnabled*/,
          this.isAutoPilotSelected()
        );
      }
@@ -190,19 +182,12 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
      let estimatedSpend: string;
      let estimatedSharedSpendAcknowledge: string;
      if (!this.isSharedAutoPilotSelected()) {
-        estimatedSpend = PricingUtils.getEstimatedSpendHtml(
-          this.keyspaceThroughput(),
-          serverId,
-          regions,
-          multimaster,
-          false /*rupmEnabled*/
-        );
+        estimatedSpend = PricingUtils.getEstimatedSpendHtml(this.keyspaceThroughput(), serverId, regions, multimaster);
        estimatedSharedSpendAcknowledge = PricingUtils.getEstimatedSpendAcknowledgeString(
          this.keyspaceThroughput(),
          serverId,
          regions,
          multimaster,
-          false /*rupmEnabled*/,
          this.isSharedAutoPilotSelected()
        );
      } else {
@@ -217,7 +202,6 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
          serverId,
          regions,
          multimaster,
-          false /*rupmEnabled*/,
          this.isSharedAutoPilotSelected()
        );
      }
@@ -312,8 +296,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
        storage: Constants.BackendDefaults.multiPartitionStorageInGb,
        offerThroughput: this.throughput(),
        partitionKey: "",
-        databaseId: this.keyspaceId(),
-        rupm: false
+        databaseId: this.keyspaceId()
      }),
      subscriptionType: SubscriptionType[this.container.subscriptionType()],
      subscriptionQuotaId: this.container.quotaId(),
@@ -366,7 +349,6 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
        offerThroughput: this.throughput(),
        partitionKey: "",
        databaseId: this.keyspaceId(),
-        rupm: false,
        hasDedicatedThroughput: this.dedicateTableThroughput()
      }),
      keyspaceHasSharedOffer: this.keyspaceHasSharedOffer(),
@@ -413,7 +395,6 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
            offerThroughput: this.throughput(),
            partitionKey: "",
            databaseId: this.keyspaceId(),
-            rupm: false,
            hasDedicatedThroughput: this.dedicateTableThroughput()
          }),
          keyspaceHasSharedOffer: this.keyspaceHasSharedOffer(),
@@ -444,7 +425,6 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
            offerThroughput: this.throughput(),
            partitionKey: "",
            databaseId: this.keyspaceId(),
-            rupm: false,
            hasDedicatedThroughput: this.dedicateTableThroughput()
          },
          keyspaceHasSharedOffer: this.keyspaceHasSharedOffer(),
--- a/src/Explorer/Tabs/DatabaseSettingsTab.ts
+++ b/src/Explorer/Tabs/DatabaseSettingsTab.ts
@@ -155,8 +155,7 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
          this.overrideWithAutoPilotSettings() ? this.autoPilotThroughput() : this.throughput(),
          serverId,
          regions,
-          multimaster,
-          false /*rupmEnabled*/
+          multimaster
        );
      } else {
        estimatedSpend = PricingUtils.getEstimatedAutoscaleSpendHtml(