diff --git a/module/cne/model.php b/module/cne/model.php index 3f699c0107..3546b16dcc 100644 --- a/module/cne/model.php +++ b/module/cne/model.php @@ -156,17 +156,17 @@ class cneModel extends model * Get default username and password of app. * * @param object $instance - * @param string $cluster + * @param string $component * @access public * @return object|null */ - public function getDefaultAccount(object $instance, string $cluster = '', string $component = ''): ?object + public function getDefaultAccount(object $instance, string $component = ''): ?object { $apiUrl = '/api/cne/app/account?channel='. (empty($instance->channel) ? $this->config->CNE->api->channel : $instance->channel); $apiParams = array(); $apiParams['name'] = $instance->k8name; $apiParams['namespace'] = $instance->spaceData->k8space; - $apiParams['cluster'] = $cluster; + $apiParams['cluster'] = ''; if($component) $apiParams['component'] = $component; $result = $this->apiGet($apiUrl, $apiParams, $this->config->CNE->api->headers, $this->config->CNE->api->host); diff --git a/module/cne/test/cne.class.php b/module/cne/test/cne.class.php index 1ae8b4872a..6356fbfb6d 100644 --- a/module/cne/test/cne.class.php +++ b/module/cne/test/cne.class.php @@ -62,4 +62,22 @@ class cneTest { return $this->objectModel->certInfo($certName); } + + /** + * Test getDefaultAccount method. + * + * @param string $component + * @access public + * @return object|null + */ + public function getDefaultAccountTest(string $component = ''): object|null + { + $this->objectModel->error = new stdclass(); + $instance = $this->objectModel->loadModel('instance')->getByID(2); + + $result = $this->objectModel->getDefaultAccount($instance, $component); + if(!empty($this->objectModel->error->message)) return $this->objectModel->error; + + return $result; + } } diff --git a/module/cne/test/model/getdefaultaccount.php b/module/cne/test/model/getdefaultaccount.php new file mode 100755 index 0000000000..2d65d0a110 --- /dev/null +++ b/module/cne/test/model/getdefaultaccount.php @@ -0,0 +1,28 @@ +#!/usr/bin/env php +getDefaultAccount(); +timeout=0 +cid=1 + +- 不传递组件名属性username @admin +- 传递错误的组件名属性username @0 + +*/ + +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/cne.class.php'; + +zdTable('space')->config('space')->gen(2); +zdTable('solution')->config('solution')->gen(1); +zdTable('instance')->config('instance')->gen(2, true, false); + +$cneModel = new cneTest(); +$component = ''; + +r($cneModel->getDefaultAccountTest($component)) && p('username') && e('admin'); // 不传递组件名 + +$component = 'username'; +r($cneModel->getDefaultAccountTest($component)) && p('username') && e('0'); // 传递错误的组件名 \ No newline at end of file diff --git a/module/system/control.php b/module/system/control.php index 5885c1715e..fa7de6b1d9 100644 --- a/module/system/control.php +++ b/module/system/control.php @@ -100,7 +100,7 @@ class system extends control $minioInstance->spaceData = new stdclass; $minioInstance->spaceData->k8space = $this->config->k8space; - $ossAccount = $this->cne->getDefaultAccount($minioInstance, '', 'minio'); + $ossAccount = $this->cne->getDefaultAccount($minioInstance, 'minio'); $ossDomain = $this->cne->getDomain($minioInstance, '', 'minio'); $this->view->title = $this->lang->system->oss->common; @@ -260,7 +260,7 @@ class system extends control $minioInstance->spaceData = new stdclass; $minioInstance->spaceData->k8space = $this->config->k8space; - $ossAccount = $this->loadModel('cne')->getDefaultAccount($minioInstance, '', 'minio'); + $ossAccount = $this->loadModel('cne')->getDefaultAccount($minioInstance, 'minio'); $ossDomain = $this->cne->getDomain($minioInstance, '', 'minio'); $ossDomain->domain = $ossDomain->access_host;