commit 4b71cd4

Merge: 35e81ce 2eb906a Author: Michael Barz <[email protected]> Date: Wed May 4 16:36:01 2022 +0200 Merge pull request #3678 from owncloud/v2 Update ocis packages and imports to V2
owncloud · May 4, 2022 · 1e96b19 · 1e96b19
1 parent 5e459cd
commit 1e96b19
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/grpc_apis/ocis/messages/accounts/v0/grpc.md b/grpc_apis/ocis/messages/accounts/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.accounts.v0"
 url: /grpc_apis/ocis_messages_accounts_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/search/v0/grpc.md b/grpc_apis/ocis/messages/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.search.v0"
 url: /grpc_apis/ocis_messages_search_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/settings/v0/grpc.md b/grpc_apis/ocis/messages/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.settings.v0"
 url: /grpc_apis/ocis_messages_settings_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/store/v0/grpc.md b/grpc_apis/ocis/messages/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.store.v0"
 url: /grpc_apis/ocis_messages_store_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.thumbnails.v0"
 url: /grpc_apis/ocis_messages_thumbnails_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/accounts/v0/grpc.md b/grpc_apis/ocis/services/accounts/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.accounts.v0"
 url: /grpc_apis/ocis_services_accounts_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/search/v0/grpc.md b/grpc_apis/ocis/services/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.search.v0"
 url: /grpc_apis/ocis_services_search_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/settings/v0/grpc.md b/grpc_apis/ocis/services/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.settings.v0"
 url: /grpc_apis/ocis_services_settings_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/store/v0/grpc.md b/grpc_apis/ocis/services/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.store.v0"
 url: /grpc_apis/ocis_services_store_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/grpc_apis/ocis/services/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.thumbnails.v0"
 url: /grpc_apis/ocis_services_thumbnails_v0
-date: 2022-05-04T14:33:12Z
+date: 2022-05-04T14:41:59Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---

diff --git a/helpers/adoc-generator.go.tmpl b/helpers/adoc-generator.go.tmpl
@@ -34,7 +34,7 @@ if err != nil {
     log.Fatal(err)
 }
 replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/extensions/", "",
+		"github.com/owncloud/ocis/v2/extensions/", "",
 		"/pkg/config/defaults", "",
 	)
 var fields []ConfigField
@@ -95,7 +95,7 @@ func GetAnnotatedVariables(s interface{}) []ConfigField {
 			// and this should not be an issue then
 			if !value.IsZero() && value.Elem().CanInterface() {
 				fields = append(fields, GetAnnotatedVariables(value.Elem().Interface())...)
-			} 
+			}
 		case reflect.Struct:
 			fields = append(fields, GetAnnotatedVariables(value.Interface())...)
 		}

diff --git a/helpers/configenvextractor.go b/helpers/configenvextractor.go
@@ -25,7 +25,7 @@ func main() {
 		log.Fatal(err)
 	}
 	replacer := strings.NewReplacer(
-		"../../", "github.com/owncloud/ocis/",
+		"../../", "github.com/owncloud/ocis/v2/",
 		"/defaultconfig.go", "",
 	)
 	for i := range paths {

diff --git a/helpers/environment-variable-docs-generator.go.tmpl b/helpers/environment-variable-docs-generator.go.tmpl
@@ -28,7 +28,7 @@ if err != nil {
     log.Fatal(err)
 }
 replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/extensions/", "",
+		"github.com/owncloud/ocis/v2/extensions/", "",
 		"/pkg/config/defaults", "",
 	)
 var fields []ConfigField
@@ -84,7 +84,7 @@ func GetAnnotatedVariables(s interface{}) []ConfigField {
 			// and this should not be an issue then
 			if !value.IsZero() && value.Elem().CanInterface() {
 				fields = append(fields, GetAnnotatedVariables(value.Elem().Interface())...)
-			} 
+			}
 		case reflect.Struct:
 			fields = append(fields, GetAnnotatedVariables(value.Interface())...)
 		}

diff --git a/helpers/example-config-generator.go.tmpl b/helpers/example-config-generator.go.tmpl
@@ -15,7 +15,7 @@ import (
 
 func main() {
 	replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/extensions/", "",
+		"github.com/owncloud/ocis/v2/extensions/", "",
 		"/pkg/config/defaults", "",
 	)
 	cfg := map[string]string{