diff --git a/README.md b/README.md index cdc88e0b7..1755c0680 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ considered to be in development. Experimental modules are included in the "Apige ## Support for Apigee Hybrid Cloud: Beta Release -Support for [Apigee hybrid API](https://docs.apigee.com/hybrid/reference-overview) has been added but is considered to -be an beta. If you run into any problems, add an issue to our [GitHub issue queue](https://github.com/apigee/apigee-edge-drupal/issues). +Support for [Apigee hybrid API](https://docs.apigee.com/hybrid/reference-overview) is now considered production ready. +If you run into any problems, add an issue to our [GitHub issue queue](https://github.com/apigee/apigee-edge-drupal/issues). Please note that Team APIs and Monetization APIs are not currently supported on Apigee hybrid. ## Requirements diff --git a/apigee_edge.install b/apigee_edge.install index d344320d3..eddebae5c 100644 --- a/apigee_edge.install +++ b/apigee_edge.install @@ -33,7 +33,6 @@ use Drupal\user\RoleInterface; */ function apigee_edge_requirements($phase) { $requirements = []; - $hybrid_support_message = t('Support for Apigee hybrid in the Apigee modules is in Beta. Connecting to a hybrid organization is appropriate for evaluation and testing purposes during this pre-production stage.'); if ($phase === 'install') { // This should be checked only if Drupal is installed. @@ -51,25 +50,12 @@ function apigee_edge_requirements($phase) { } } - \Drupal::messenger()->addWarning($hybrid_support_message); } elseif ($phase === 'runtime') { /** @var \Drupal\apigee_edge\SDKConnectorInterface $sdk_connector */ $sdk_connector = \Drupal::service('apigee_edge.sdk_connector'); try { $sdk_connector->testConnection(); - - // Hybrid support warning. - $org_controller = \Drupal::service('apigee_edge.controller.organization'); - /* @var \Apigee\Edge\Api\Management\Entity\Organization $organization */ - $organization = $org_controller->load($sdk_connector->getOrganization()); - if ($organization && OrganizationFeatures::isHybridEnabled($organization)) { - $requirements['apigee_edge_hybrid_support'] = [ - 'title' => t('Apigee Edge'), - 'description' => $hybrid_support_message, - 'severity' => REQUIREMENT_WARNING, - ]; - } } catch (\Exception $exception) { $requirements['apigee_edge_connection_error'] = [ diff --git a/src/Plugin/KeyInput/ApigeeAuthKeyInput.php b/src/Plugin/KeyInput/ApigeeAuthKeyInput.php index 9b3dfe5b4..4d2ec06c6 100644 --- a/src/Plugin/KeyInput/ApigeeAuthKeyInput.php +++ b/src/Plugin/KeyInput/ApigeeAuthKeyInput.php @@ -88,15 +88,6 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta ], '#default_value' => $values['instance_type'] ?? 'public', ]; - $form['hybrid_support_info'] = [ - '#type' => 'fieldset', - '#title' => $this->t('Support for Apigee hybrid'), - '#description' => $this->t('Support for Apigee hybrid in the Apigee modules is in Beta. Connecting to a hybrid organization is appropriate for evaluation and testing purposes during this pre-production stage.'), - - '#states' => [ - 'visible' => $state_for_hybrid, - ], - ]; $form['auth_type'] = [ '#type' => 'select', '#title' => $this->t('Authentication type'),