Commit f8e0b7f0 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '6-add-file-delete-endpoint' into 'main' 

add delete endpoint, refactor

Closes #6

See merge request !10
parents de5efe99 79ad6a7d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  TAG: 0.2.2

  TAG: 0.3.0



# This import is for the func_rse_docker_* functions

before_script:

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ORNL") 
SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL")



set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "2")

set(CPACK_PACKAGE_VERSION_PATCH "2")

set(CPACK_PACKAGE_VERSION_MINOR "3")

set(CPACK_PACKAGE_VERSION_PATCH "0")



INCLUDE(CPack)

src/common/settings.go

+5 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import ( 


type serverSettings struct {

	CatCommand    string

	DeleteCommand string

	TestCommand   string

	Auth          struct {

		Enabled  bool
@@ -36,6 +37,7 @@ var Settings serverSettings 
func ReadConfig(fname string) (log.Level, error) {

	// need to set defaults for all nested values, othervise Viper does not read them from environment!

	viper.SetDefault("CatCommand", "cat $filename")

	viper.SetDefault("DeleteCommand", "delete $filename")

	viper.SetDefault("TestCommand", "test -r $filename")

	viper.SetDefault("Http.Enabled", true)

	viper.SetDefault("Http.EndpointUrl", "http://localhost")

src/common/structs.go

+4 −3
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ package common 
type FileMessage struct {

	Endpoint  string

	Filename  string

	Operation string

	Token     string

}

src/common/version.go

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import ( 
var version string



func init() {

	version = "0.2.2"

	version = "0.3.0"

	rdbApiVersion = "v0.1"

}