Make sure to always use same environment to fetch global announcements and news

modules/helfi_global_announcement/README.md

@@ -7,6 +7,3 @@ Global announcements can be fetched to any instance and rendered using blocks.
 ## How to set up locally
 
 Local setup requires Etusivu-instance to be up and running with some relevant data created to it.
-
-Add following line to local.settings.php in order to connect to local etusivu-instance
-`$config['helfi_global_announcement.settings']['source_environment'] = 'local'`

modules/helfi_global_announcement/src/Plugin/ExternalEntities/StorageClient/Announcements.php

@@ -71,24 +71,8 @@ public static function create(
 
     /** @var \Drupal\helfi_api_base\Environment\EnvironmentResolver $environmentResolver */
     $environmentResolver = $container->get('helfi_api_base.environment_resolver');
-
-    // Attempt to read environment from config override and fallback to
-    // currently active environment.
-    $environment = $container->get('config.factory')
-      ->get('helfi_global_announcement.settings')
-      ->get('source_environment');
-
-    if (!$environment) {
-      try {
-        $environment = $environmentResolver->getActiveEnvironment()
-          ->getEnvironmentName();
-      }
-      catch (\InvalidArgumentException) {
-        $environment = 'prod';
-      }
-    }
     $instance->environment = $environmentResolver
-      ->getEnvironment(Project::ETUSIVU, $environment);
+      ->getEnvironment(Project::ETUSIVU, $environmentResolver->getActiveEnvironmentName());
 
     return $instance;
   }

modules/helfi_paragraphs_news_list/README.md

@@ -8,15 +8,6 @@ News items are fetched runtime using [external_entities](https://www.drupal.org/
 
 Enable the `helfi_paragraphs_news_list` module.
 
-## Overriding the source environment
-
-The source environment (production by default) can be changed by overriding the  `helfi_paragraphs_news_list.settings.source_environment` configuration.
-
-For example:
-```php
-# public/sites/default/local.settings.php
-$config['helfi_paragraphs_news_list.settings']['source_environment'] = 'dev';
-```
 
 ## How to add new fields to paragraph type
 

modules/helfi_paragraphs_news_list/src/HelfiExternalEntityBase.php

@@ -9,8 +9,6 @@
 use Drupal\external_entities\ExternalEntityInterface;
 use Drupal\external_entities\StorageClient\ExternalEntityStorageClientBase;
 use Drupal\helfi_api_base\Environment\Environment;
-use Drupal\helfi_api_base\Environment\EnvironmentEnum;
-use Drupal\helfi_api_base\Environment\EnvironmentResolverInterface;
 use Drupal\helfi_api_base\Environment\Project;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
@@ -52,11 +50,11 @@ abstract class HelfiExternalEntityBase extends ExternalEntityStorageClientBase {
   protected string $endpoint;
 
   /**
-   * The environment resolver.
+   * The active endpoint environment.
    *
-   * @var \Drupal\helfi_api_base\Environment\EnvironmentResolverInterface
+   * @var \Drupal\helfi_api_base\Environment\Environment
    */
-  protected EnvironmentResolverInterface $environmentResolver;
+  private Environment $environment;
 
   /**
    * The config factory service.
@@ -77,8 +75,12 @@ public static function create(
     $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
     $instance->languageManager = $container->get('language_manager');
     $instance->client = $container->get('http_client');
-    $instance->environmentResolver = $container->get('helfi_api_base.environment_resolver');
     $instance->configFactory = $container->get('config.factory');
+    /** @var \Drupal\helfi_api_base\Environment\EnvironmentResolver $environmentResolver */
+    $environmentResolver = $container->get('helfi_api_base.environment_resolver');
+    $instance->environment = $environmentResolver
+      ->getEnvironment(Project::ETUSIVU, $environmentResolver->getActiveEnvironmentName());
+
     return $instance;
   }
 
@@ -191,27 +193,6 @@ public function delete(ExternalEntityInterface $entity) : void {
     throw new EntityStorageException('::delete() is not supported.');
   }
 
-  /**
-   * Gets the endpoint environment.
-   *
-   * @return \Drupal\helfi_api_base\Environment\Environment
-   *   The environment.
-   */
-  protected function getEnvironment() : Environment {
-    static $environment = NULL;
-
-    if ($environment === NULL) {
-      $environment = $this->configFactory->get('helfi_paragraphs_news_list.settings')
-        ->get('source_environment') ?: EnvironmentEnum::Prod->value;
-
-      /** @var \Drupal\helfi_api_base\Environment\EnvironmentResolver $environmentResolver */
-      $environment = $this->environmentResolver
-        ->getEnvironment(Project::ETUSIVU, $environment);
-    }
-
-    return $environment;
-  }
-
   /**
    * Formats the JSON response.
    *
@@ -318,7 +299,7 @@ protected function request(
         ->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)
         ->getId();
       $uri = vsprintf('%s%s?%s', [
-        $this->getEnvironment()->getInternalAddress($langcode),
+        $this->environment->getInternalAddress($langcode),
         $this->endpoint,
         \GuzzleHttp\http_build_query($parameters),
       ]);

modules/helfi_paragraphs_news_list/tests/src/Kernel/NewsExternalEntityTest.php

@@ -6,7 +6,10 @@
 
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\external_entities\ExternalEntityStorageInterface;
+use Drupal\helfi_api_base\Environment\EnvironmentEnum;
+use Drupal\helfi_api_base\Environment\Project;
 use Drupal\Tests\helfi_api_base\Traits\ApiTestTrait;
+use Drupal\Tests\helfi_api_base\Traits\EnvironmentResolverTrait;
 use Drupal\Tests\helfi_api_base\Traits\TestLoggerTrait;
 use GuzzleHttp\Exception\RequestException;
 use Psr\Http\Message\RequestInterface;
@@ -20,13 +23,15 @@ class NewsExternalEntityTest extends KernelTestBase {
 
   use ApiTestTrait;
   use TestLoggerTrait;
+  use EnvironmentResolverTrait;
 
   /**
    * {@inheritdoc}
    */
   public function setUp(): void {
     parent::setUp();
     $this->setUpMockLogger();
+    $this->setActiveProject(Project::ASUMINEN, EnvironmentEnum::Local);
   }
 
   /**