Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,13 @@ module.exports = {

'function-call-argument-newline': 'off',

'space-unary-ops': ['error', { words: false, nonwords: false }],
'space-unary-ops': ['error', {
words: true,
nonwords: false,
overrides: {
typeof: false,
},
}],

// max line length is 80 by default, allow some slack
// TODO eslint max-len for code lines should be error and reduced to ~100 instead of 140
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ noobaa: base
@echo "\033[1;32mNooBaa done.\033[0m"
.PHONY: noobaa

nbdev:
$(CONTAINER_ENGINE) build $(CPUSET) -f src/deploy/NVA_build/dev.Dockerfile $(CACHE_FLAG) -t nbdev --build-arg GIT_COMMIT=$(GIT_COMMIT) . $(REDIRECT_STDOUT)
@echo "\033[1;32mImage 'nbdev' is ready.\033[0m"
@echo "Usage: docker run -it nbdev"
.PHONY: nbdev

clean:
@echo Stopping and Deleting containers
@$(CONTAINER_ENGINE) ps -a | grep noobaa_ | awk '{print $1}' | xargs $(CONTAINER_ENGINE) stop &> /dev/null
Expand Down
2 changes: 1 addition & 1 deletion src/agent/block_store_services/block_store_base.js
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ class BlockStoreBase {
const reply = {};
const delay_ms = 200;
const data = crypto.randomBytes(1024);
const digest_type = config.CHUNK_CODER_FRAG_DIGEST_TYPE;
const digest_type = config.CHUNK_CODER_FRAG_DIGEST_TYPE || 'sha1';
const block_md = {
id: '_test_store_perf',
digest_type,
Expand Down
65 changes: 34 additions & 31 deletions src/api/bucket_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,6 @@ module.exports = {

methods: {

put_object_lock_configuration: {
method: 'PUT',
params: {
type: 'object',
required: ['name', 'object_lock_configuration'],
properties: {
name: { $ref: 'common_api#/definitions/bucket_name' },
object_lock_configuration: { $ref: '#/definitions/object_lock_configuration' },
},
},
auth: {
system: 'admin'
},
},
get_object_lock_configuration: {
method: 'GET',
params: {
type: 'object',
required: ['name'],
properties: {
name: { $ref: 'common_api#/definitions/bucket_name' },
},
},
reply: {
$ref: '#/definitions/object_lock_configuration'
},
auth: {
system: 'admin'
},
},
create_bucket: {
method: 'POST',
params: {
Expand Down Expand Up @@ -916,7 +886,40 @@ module.exports = {
auth: {
system: 'admin'
}
}
},

put_object_lock_configuration: {
method: 'PUT',
params: {
type: 'object',
required: ['name', 'object_lock_configuration'],
properties: {
name: { $ref: 'common_api#/definitions/bucket_name' },
object_lock_configuration: { $ref: '#/definitions/object_lock_configuration' },
},
},
auth: {
system: 'admin'
},
},

get_object_lock_configuration: {
method: 'GET',
params: {
type: 'object',
required: ['name'],
properties: {
name: { $ref: 'common_api#/definitions/bucket_name' },
},
},
reply: {
$ref: '#/definitions/object_lock_configuration'
},
auth: {
system: 'admin'
},
},

},

definitions: {
Expand Down
Loading