variable name change

Author: divya-intelli

src/KeyEntityFormEnhancer.php

@@ -355,10 +355,10 @@ public function validateForm(array &$form, FormStateInterface $form_state): void
       }
 
       // Data Residency check.
-      \Drupal::state()->delete(DataResidencyEndpointInterface::ENDPOINT_KEY);
+      \Drupal::state()->delete(DataResidencyEndpointInterface::DRZ_ENDPOINT);
       $key_value_array = json_decode($key_value, TRUE);
       if ($key_value_array['instance_type'] == EdgeKeyTypeInterface::INSTANCE_TYPE_HYBRID) {
-        $this->dataResidencyEndpoint->discoverEndpoint($test_key);
+        $this->dataResidencyEndpoint->getEndpoint($test_key);
       }
 
       // Test the connection.

src/Plugin/EdgeKeyTypeBase.php

@@ -71,7 +71,7 @@ public function getAuthenticationType(KeyInterface $key): string {
    */
   public function getEndpoint(KeyInterface $key): string {
     if ($this->getInstanceType($key) === EdgeKeyTypeInterface::INSTANCE_TYPE_HYBRID) {
-      if ($endpoint = \Drupal::state()->get(DataResidencyEndpointInterface::ENDPOINT_KEY)) {
+      if ($endpoint = \Drupal::state()->get(DataResidencyEndpointInterface::DRZ_ENDPOINT)) {
         return $endpoint;
       }
       return ClientInterface::APIGEE_ON_GCP_ENDPOINT;

src/Service/DataResidencyEndpoint.php

@@ -85,7 +85,7 @@ public function __construct(SDKConnectorInterface $sdk_connector, StateInterface
   /**
    * {@inheritdoc}
    */
-  public function discoverEndpoint(KeyInterface $key): void {
+  public function getEndpoint(KeyInterface $key): void {
     /** @var \Drupal\apigee_edge\Plugin\KeyType\ApigeeAuthKeyType $key_type */
     $key_type = $key->getKeyType();
 
@@ -99,17 +99,17 @@ public function discoverEndpoint(KeyInterface $key): void {
       if (isset($dataResidencyData['location']) && $dataResidencyData['location']) {
         $dataResidencyEndpoint = str_replace("https://", "https://{$dataResidencyData['location']}-", $base_endpoint);
 
-        $this->state->set(self::ENDPOINT_KEY, $dataResidencyEndpoint);
+        $this->state->set(self::DRZ_ENDPOINT, $dataResidencyEndpoint);
         $this->messenger->addStatus($this->stringTranslation->translate('Data residency is enabled for this organization. Service endpoint being used is @serviceEndpoint', ['@serviceEndpoint' => $dataResidencyEndpoint]));
       }
       else {
-        $this->state->delete(self::ENDPOINT_KEY);
+        $this->state->delete(self::DRZ_ENDPOINT);
       }
     }
     catch (\Exception $e) {
       // We can ignore this exception, as it means that the data residency
       // endpoint could not be determined.
-      $this->state->delete(self::ENDPOINT_KEY);
+      $this->state->delete(self::DRZ_ENDPOINT);
     }
   }
 

src/Service/DataResidencyEndpointInterface.php

@@ -30,14 +30,14 @@ interface DataResidencyEndpointInterface {
   /**
    * The key used to store the endpoint in the state.
    */
-  public const ENDPOINT_KEY = 'drzendpoint';
+  public const DRZ_ENDPOINT = 'drzendpoint';
 
   /**
    * Discovers and stores the data residency endpoint for a given key.
    *
    * @param \Drupal\key\KeyInterface $key
    *   The key to discover the endpoint for.
    */
-  public function discoverEndpoint(KeyInterface $key): void;
+  public function getEndpoint(KeyInterface $key): void;
 
 }