Commit db6adcbf authored by Bob Kepford's avatar Bob Kepford Committed by Mike Crittenden
Browse files

Issue #3042446 by kepford: Add support for 6.x Branch of Elasticsearch Connector module

parent d270579a

composer.json

+9 −1
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 
    "type": "drupal-module",

    "homepage": "https://drupal.org/project/elasticsearch_aws_connector",

    "license": "GPL-2.0+",

    "repositories": [

      {

        "type": "composer",

        "url": "https://packages.drupal.org/8"

      }

    ],

    "authors": [

        {

            "name": "Jochen Verdeyen (jover)",
@@ -15,9 +21,11 @@ 
        "issues": "https://www.drupal.org/project/issues/elasticsearch_aws_connector",

        "source": "http://cgit.drupalcode.org/elasticsearch_aws_connector"

    },

    "minimum-stability": "dev",

    "prefer-stable": true,

    "require": {

        "drupal/core": "^8",

        "drupal/elasticsearch_connector": "5.x-dev",

        "drupal/elasticsearch_connector": "6.x-dev",

        "jsq/amazon-es-php": "^0.2.0"

    }

}

elasticsearch_aws_connector.module

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
use Aws\Credentials\CredentialProvider;

use Aws\Credentials\Credentials;

use Aws\ElasticsearchService\ElasticsearchPhpHandler;

use Drupal\elasticsearch_connector\Entity\Cluster;



const ELASTICSEARCH_AWS_CONNECTOR_AWS_SR_KEY = 'elasticsearch_aws_connector_aws_signed_requests';
@@ -16,7 +17,7 @@ include_once __DIR__ . '/elasticsearch_aws_connector.forms.inc'; 
/**

 * Implements hook_elasticsearch_connector_load_library_options_alter().

 */

function elasticsearch_aws_connector_elasticsearch_connector_load_library_options_alter(array &$options, \Drupal\elasticsearch_connector\Entity\Cluster $cluster) {

function elasticsearch_aws_connector_elasticsearch_connector_load_library_options_alter(array &$options, Cluster $cluster) {

  // Return if no authentication is used.

  if (!isset($options['auth'])) {

    return;