Merge remote-tracking branch 'origin/master'

ipunkt · Mar 5, 2019 · 551070d · 551070d
2 parents fb343d6 + b568fc4
commit 551070d
Showing 1 changed file with 90 additions and 30 deletions.
diff --git a/app/EnvironmentAccessConfig/RancherAccessEnvironmentService.php b/app/EnvironmentAccessConfig/RancherAccessEnvironmentService.php
@@ -1,4 +1,5 @@
 <?php namespace Rancherize\EnvironmentAccessConfig;
+
 use Rancherize\RancherAccess\ArrayRancherAccount;
 use Rancherize\RancherAccess\RancherAccessService;
 
@@ -11,39 +12,98 @@
 class RancherAccessEnvironmentService implements RancherAccessService
 {
 
-	/**
-	 * @var array
-	 */
-	private $account = [];
-
-	public function __construct() {
-		$this->account = [
-			'url' => getenv('RANCHER_URL'),
-			'key' => getenv('RANCHER_KEY'),
-			'secret' => getenv('RANCHER_SECRET')
-		];
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function availableAccounts() {
-		return ['default'];
-	}
+    /**
+     * @var array
+     */
+    private $account = [];
+
+    public function __construct()
+    {
+        $this->account = [
+            'url' => getenv('RANCHER_URL'),
+            'key' => getenv('RANCHER_KEY'),
+            'secret' => getenv('RANCHER_SECRET')
+        ];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function availableAccounts()
+    {
+        return ['default'];
+    }
 
     /**
      * @param string $name
      * @return ArrayRancherAccount
      */
-	public function getAccount(string $name) : ArrayRancherAccount {
-		$capitalName = strtoupper($name);
-		if( !empty( getenv('RANCHER_'.$capitalName.'_URL') ) )
-			return new ArrayRancherAccount([
-				'url' => getenv('RANCHER_'.$capitalName.'_URL'),
-				'key' => getenv('RANCHER_'.$capitalName.'_KEY'),
-				'secret' => getenv('RANCHER_'.$capitalName.'_SECRET')
-			]);
-
-		return new ArrayRancherAccount($this->account);
-	}
+    public function getAccount(string $name): ArrayRancherAccount
+    {
+
+        $capitalName = $this->makeCapitalOnlyName($name);
+        if ($this->nameExistsInEnvironment($capitalName)) {
+            return $this->makeAccount($capitalName);
+        }
+
+        $environmentName = $this->makeCapitalAndUnderscores($name);
+        if ($this->nameExistsInEnvironment($environmentName)) {
+            return $this->makeAccount($environmentName);
+        }
+
+        return new ArrayRancherAccount($this->account);
+    }
+
+    /**
+     * @param $name
+     * @return string
+     */
+    protected function makeCapitalOnlyName($name)
+    {
+        return strtoupper($name);
+    }
+
+    /**
+     * @param $name
+     * @return string
+     */
+    protected function makeCapitalAndUnderscores($name)
+    {
+
+        $capitalName = strtoupper($name);
+
+        $capitalNameWithUnderscores = str_replace('-', '_', $capitalName);
+
+        return $capitalNameWithUnderscores;
+    }
+
+    /**
+     * @param $name
+     * @return bool
+     */
+    protected function nameExistsInEnvironment($name)
+    {
+        $url = getenv('RANCHER_' . $name . '_URL');
+
+        $urlIsSet = !empty($url);
+
+        if ($urlIsSet) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $name
+     * @return ArrayRancherAccount
+     */
+    protected function makeAccount($name)
+    {
+        return new ArrayRancherAccount([
+            'url' => getenv('RANCHER_' . $name . '_URL'),
+            'key' => getenv('RANCHER_' . $name . '_KEY'),
+            'secret' => getenv('RANCHER_' . $name . '_SECRET')
+        ]);
+    }
 }