abh1sar commented on code in PR #12124:
URL: https://github.com/apache/cloudstack/pull/12124#discussion_r2650849778
##########
ui/src/views/infra/AddObjectStorage.vue:
##########
@@ -165,26 +240,66 @@ export default {
const formRaw = toRaw(this.form)
const values = this.handleRemoveFields(formRaw)
- var data = {
- name: values.name,
- size: values.size
+ const data = {
+ name: values.name
Review Comment:
size can apply to all providers (it's for framework level tracking)
##########
plugins/storage/object/ECS/src/main/java/org/apache/cloudstack/storage/datastore/driver/EcsObjectStoreDriverImpl.java:
##########
@@ -0,0 +1,1560 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.storage.datastore.driver;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.net.ssl.SSLContext;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.storage.datastore.db.ObjectStoreDetailsDao;
+import org.apache.cloudstack.storage.object.BaseObjectStoreDriverImpl;
+import org.apache.cloudstack.storage.object.Bucket;
+import org.apache.cloudstack.storage.object.BucketObject;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.ssl.TrustStrategy;
+import org.apache.http.util.EntityUtils;
+
+import com.amazonaws.services.s3.model.AccessControlList;
+import com.amazonaws.services.s3.model.BucketPolicy;
+import com.cloud.agent.api.to.BucketTO;
+import com.cloud.agent.api.to.DataStoreTO;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.storage.BucketVO;
+import com.cloud.storage.dao.BucketDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountDetailVO;
+import com.cloud.user.AccountDetailsDao;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class EcsObjectStoreDriverImpl extends BaseObjectStoreDriverImpl {
+
+ // ---- Injected dependencies ----
+ @Inject private AccountDao accountDao;
Review Comment:
```suggestion
@Inject
private AccountDao accountDao;
```
Please break into two lines
##########
ui/src/views/storage/CreateBucket.vue:
##########
@@ -110,18 +118,56 @@ export default {
inject: ['parentFetchData'],
data () {
return {
- loading: false
+ loading: false,
+ objectstores: [],
+ policyList: ['Public', 'Private']
+ }
+ },
+ computed: {
+ isEcsObjectStore () {
+ const selectedId = this.form?.objectstore
+ const stores = this.objectstores || []
+ const selected = stores.find(os => os.id === selectedId)
+ if (!selected) {
+ return false
+ }
+
+ const provider = (
+ selected.objectstoreprovider ||
+ selected.objectStoreProvider ||
+ selected.provider ||
+ ''
+ ).toString().toUpperCase()
+
+ const name = (selected.name || '').toString().toUpperCase()
Review Comment:
We should only rely on the `providername` not `name`
##########
ui/src/views/infra/AddObjectStorage.vue:
##########
@@ -67,16 +68,82 @@
<!-- Use secretKey field for the password to make provider shared
configuration easier -->
<a-input-password v-model:value="form.secretKey"
autocomplete="off"/>
</a-form-item>
- <a-form-item name="s3Url" ref="s3Url"
:label="$t('label.cloudian.s3.url')" :rules="[{ required: true, message:
this.$t('label.required') }]">
+ <a-form-item name="s3Url" ref="s3Url"
:label="$t('label.cloudian.s3.url')" :rules="[{ required: true, message:
$t('label.required') }]">
<a-input v-model:value="form.s3Url"
placeholder="https://s3-hostname or http://s3-hostname"/>
</a-form-item>
- <a-form-item name="iamUrl" ref="iamUrl"
:label="$t('label.cloudian.iam.url')" :rules="[{ required: true, message:
this.$t('label.required') }]">
+ <a-form-item name="iamUrl" ref="iamUrl"
:label="$t('label.cloudian.iam.url')" :rules="[{ required: true, message:
$t('label.required') }]">
<a-input v-model:value="form.iamUrl"
placeholder="https://iam-hostname:16443 or http://iam-hostname:16080"/>
</a-form-item>
</div>
+ <!-- ECS Object Store Configuration -->
+ <div v-else-if="form.provider === 'ECS'">
+ <!-- S3 URL (for UI: this becomes addObjectStoragePool url=...) -->
+ <a-form-item name="url" ref="url">
+ <template #label>
+ <tooltip-label :title="'ECS Public URL'" :tooltip="'The
S3-compatible endpoint URL that clients use to connect to ECS'"/>
Review Comment:
Suggest putting all user-facing strings in en.json and using $t() to access
them
##########
ui/src/views/infra/AddObjectStorage.vue:
##########
@@ -165,26 +240,66 @@ export default {
const formRaw = toRaw(this.form)
const values = this.handleRemoveFields(formRaw)
- var data = {
- name: values.name,
- size: values.size
+ const data = {
+ name: values.name
}
- var provider = values.provider
+ const provider = values.provider
data.provider = provider
data.url = values.url
- data['details[0].key'] = 'accesskey'
- data['details[0].value'] = values.accessKey
- data['details[1].key'] = 'secretkey'
- data['details[1].value'] = values.secretKey
if (provider === 'Cloudian HyperStore') {
+ // Cloudian HyperStore details
+ data['details[0].key'] = 'accesskey'
+ data['details[0].value'] = values.accessKey
+ data['details[1].key'] = 'secretkey'
+ data['details[1].value'] = values.secretKey
data['details[2].key'] = 'validateSSL'
data['details[2].value'] = values.validateSSL
data['details[3].key'] = 's3Url'
data['details[3].value'] = values.s3Url
data['details[4].key'] = 'iamUrl'
data['details[4].value'] = values.iamUrl
+ } else if (provider === 'ECS') {
Review Comment:
Could you put this in a separate method?
##########
ui/src/views/storage/CreateBucket.vue:
##########
@@ -110,18 +118,56 @@ export default {
inject: ['parentFetchData'],
data () {
return {
- loading: false
+ loading: false,
+ objectstores: [],
+ policyList: ['Public', 'Private']
+ }
+ },
+ computed: {
+ isEcsObjectStore () {
+ const selectedId = this.form?.objectstore
+ const stores = this.objectstores || []
+ const selected = stores.find(os => os.id === selectedId)
+ if (!selected) {
+ return false
+ }
+
+ const provider = (
+ selected.objectstoreprovider ||
Review Comment:
I think the correct field is `providername`
##########
ui/src/views/infra/AddObjectStorage.vue:
##########
@@ -67,16 +68,82 @@
<!-- Use secretKey field for the password to make provider shared
configuration easier -->
<a-input-password v-model:value="form.secretKey"
autocomplete="off"/>
</a-form-item>
- <a-form-item name="s3Url" ref="s3Url"
:label="$t('label.cloudian.s3.url')" :rules="[{ required: true, message:
this.$t('label.required') }]">
+ <a-form-item name="s3Url" ref="s3Url"
:label="$t('label.cloudian.s3.url')" :rules="[{ required: true, message:
$t('label.required') }]">
<a-input v-model:value="form.s3Url"
placeholder="https://s3-hostname or http://s3-hostname"/>
</a-form-item>
- <a-form-item name="iamUrl" ref="iamUrl"
:label="$t('label.cloudian.iam.url')" :rules="[{ required: true, message:
this.$t('label.required') }]">
+ <a-form-item name="iamUrl" ref="iamUrl"
:label="$t('label.cloudian.iam.url')" :rules="[{ required: true, message:
$t('label.required') }]">
<a-input v-model:value="form.iamUrl"
placeholder="https://iam-hostname:16443 or http://iam-hostname:16080"/>
</a-form-item>
</div>
+ <!-- ECS Object Store Configuration -->
+ <div v-else-if="form.provider === 'ECS'">
+ <!-- S3 URL (for UI: this becomes addObjectStoragePool url=...) -->
+ <a-form-item name="url" ref="url">
Review Comment:
isn't url a required field?
##########
ui/src/views/storage/UpdateBucket.vue:
##########
@@ -110,36 +132,31 @@ export default {
this.loading = true
Object.keys(this.apiParams).forEach(item => {
const field = this.apiParams[item]
- let fieldValue = null
- let fieldName = null
-
+ let fieldName = field.name
if (field.type === 'list' || field.name === 'account') {
fieldName = field.name.replace('ids', 'name').replace('id', 'name')
- } else {
- fieldName = field.name
}
- fieldValue = this.resource[fieldName] ? this.resource[fieldName] : null
- if (fieldValue) {
+ const fieldValue = this.resource[fieldName] ?? null
+ if (fieldValue !== null && fieldValue !== undefined) {
Review Comment:
fieldValue can't be undefined, right?
##########
ui/src/views/storage/UpdateBucket.vue:
##########
@@ -110,36 +132,31 @@ export default {
this.loading = true
Object.keys(this.apiParams).forEach(item => {
const field = this.apiParams[item]
- let fieldValue = null
- let fieldName = null
-
+ let fieldName = field.name
if (field.type === 'list' || field.name === 'account') {
fieldName = field.name.replace('ids', 'name').replace('id', 'name')
- } else {
- fieldName = field.name
}
- fieldValue = this.resource[fieldName] ? this.resource[fieldName] : null
- if (fieldValue) {
+ const fieldValue = this.resource[fieldName] ?? null
+ if (fieldValue !== null && fieldValue !== undefined) {
form[field.name] = fieldValue
}
})
this.loading = false
},
- handleSubmit (e) {
+ handleSubmit () {
if (this.loading) return
this.formRef.value.validate().then(() => {
- const formRaw = toRaw(this.form)
- const values = this.handleRemoveFields(formRaw)
-
- var data = {
+ const values = toRaw(this.form)
Review Comment:
Why remove `const values = this.handleRemoveFields(formRaw)`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
