Merge pull request #382 from 030/381-405-not-allowed

fix: [#381] 405 not allowed when creating repositories as 'https' cou…
030 · Oct 14, 2023 · 5ce9028 · 5ce9028
2 parents f77c065 + 03355d5
commit 5ce9028
Show file tree

Hide file tree

Showing 28 changed files with 339 additions and 177 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,8 @@
 [godoc]: https://godoc.org/github.com/030/n3dr
 [godoc widget]: https://godoc.org/github.com/030/n3dr?status.svg
 
+[![dockeri.co](https://dockeri.co/image/utrecht/n3dr)](https://hub.docker.com/r/utrecht/n3dr)
+
 ## Backup or Migrate an entire Nexus Artifact Server
 
 Download all artifacts at once or migrate automatically from Nexus to Nexus.

diff --git a/build/package/snap/snapcraft.yaml b/build/package/snap/snapcraft.yaml
@@ -1,7 +1,7 @@
 ---
 name: n3dr
 base: core20
-version: 7.2.5
+version: 7.3.1
 summary: Nexus3 Disaster Recovery
 description: |
   Download all artifacts at once or migrate automatically from Nexus to Nexus.

diff --git a/cmd/n3dr/config.go b/cmd/n3dr/config.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/030/n3dr/internal/app/n3dr/config/security"
 	"github.com/030/n3dr/internal/app/n3dr/connection"
 	log "github.com/sirupsen/logrus"
@@ -17,9 +15,12 @@ var configCmd = &cobra.Command{
 	Short: "config",
 	Long:  `config`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("config called")
-
-		n := connection.Nexus3{FQDN: n3drURL, Pass: n3drPass, User: n3drUser}
+		n := connection.Nexus3{
+			FQDN:  n3drURL,
+			HTTPS: &https,
+			Pass:  n3drPass,
+			User:  n3drUser,
+		}
 		s := security.Security{Nexus3: n}
 		if err := s.Anonymous(configUserAnonymous); err != nil {
 			log.Fatal(err)

diff --git a/cmd/n3dr/configLDAP.go b/cmd/n3dr/configLDAP.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/030/n3dr/internal/app/n3dr/config/security"
 	"github.com/030/n3dr/internal/app/n3dr/connection"
 	"github.com/030/n3dr/internal/app/n3dr/goswagger/models"
@@ -22,9 +20,12 @@ var configLDAPCmd = &cobra.Command{
 	Short: "configLDAP",
 	Long:  `configLDAP`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("configure LDAP")
-
-		n := connection.Nexus3{FQDN: n3drURL, Pass: n3drPass, User: n3drUser}
+		n := connection.Nexus3{
+			FQDN:  n3drURL,
+			HTTPS: &https,
+			Pass:  n3drPass,
+			User:  n3drUser,
+		}
 		s := security.Security{Nexus3: n}
 		m := models.CreateLdapServerXo{
 			AuthPassword:                &configLDAPAuthPassword,

diff --git a/cmd/n3dr/configRepository.go b/cmd/n3dr/configRepository.go
@@ -42,7 +42,13 @@ Examples:
   n3dr configRepository -u admin -p some-pass -n localhost:9000 --https=false --configRepoName 3rdparty-rubygems --configRepoType gem
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		n := connection.Nexus3{FQDN: n3drURL, Pass: n3drPass, StrictContentTypeValidation: strictContentTypeValidation, User: n3drUser}
+		n := connection.Nexus3{
+			FQDN:                        n3drURL,
+			HTTPS:                       &https,
+			Pass:                        n3drPass,
+			StrictContentTypeValidation: strictContentTypeValidation,
+			User:                        n3drUser,
+		}
 		r := repository.Repository{Nexus3: n}
 
 		if configRepoDelete {

diff --git a/cmd/n3dr/configUser.go b/cmd/n3dr/configUser.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"fmt"
-
 	"github.com/030/n3dr/internal/app/n3dr/config/user"
 	"github.com/030/n3dr/internal/app/n3dr/connection"
 	"github.com/030/n3dr/internal/app/n3dr/goswagger/models"
@@ -26,8 +24,6 @@ Examples:
   n3dr configUser --changePass --https false --n3drUser admin --n3drURL nexus3:8081 --n3drPass initial-pass --pass some-pass --email [email protected] --firstName admin --id admin --lastName admin
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("configUser called")
-
 		if !admin && !downloadUser && !uploadUser && !changePass {
 			log.Fatal("either the admin, changePass, downloadUser or uploadUser is required")
 		}
@@ -39,7 +35,12 @@ Examples:
 			Password:     pass,
 			UserID:       id,
 		}
-		n := connection.Nexus3{FQDN: n3drURL, Pass: n3drPass, User: n3drUser}
+		n := connection.Nexus3{
+			FQDN:  n3drURL,
+			HTTPS: &https,
+			Pass:  n3drPass,
+			User:  n3drUser,
+		}
 		u := user.User{APICreateUser: acu, Nexus3: n}
 
 		if admin {

diff --git a/cmd/n3dr/count.go b/cmd/n3dr/count.go
@@ -29,7 +29,28 @@ Examples:
   n3dr count --csv /tmp/helloworld --sort
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		n := connection.Nexus3{AwsBucket: awsBucket, AwsID: awsID, AwsRegion: awsRegion, AwsSecret: awsSecret, BasePathPrefix: basePathPrefix, FQDN: n3drURL, Pass: n3drPass, User: n3drUser, DownloadDirName: downloadDirName, DownloadDirNameZip: downloadDirNameZip, HTTPS: https, DockerHost: dockerHost, DockerPort: dockerPort, DockerPortSecure: dockerPortSecure, ZIP: zip, RepoName: n3drRepo, SkipErrors: skipErrors, WithoutWaitGroups: withoutWaitGroups, WithoutWaitGroupArtifacts: withoutWaitGroupArtifacts, WithoutWaitGroupRepositories: withoutWaitGroupRepositories}
+		n := connection.Nexus3{
+			AwsBucket:                    awsBucket,
+			AwsID:                        awsID,
+			AwsRegion:                    awsRegion,
+			AwsSecret:                    awsSecret,
+			BasePathPrefix:               basePathPrefix,
+			DockerHost:                   dockerHost,
+			DockerPort:                   dockerPort,
+			DockerPortSecure:             dockerPortSecure,
+			DownloadDirName:              downloadDirName,
+			DownloadDirNameZip:           downloadDirNameZip,
+			FQDN:                         n3drURL,
+			HTTPS:                        &https,
+			Pass:                         n3drPass,
+			RepoName:                     n3drRepo,
+			SkipErrors:                   skipErrors,
+			User:                         n3drUser,
+			WithoutWaitGroupArtifacts:    withoutWaitGroupArtifacts,
+			WithoutWaitGroupRepositories: withoutWaitGroupRepositories,
+			WithoutWaitGroups:            withoutWaitGroups,
+			ZIP:                          zip,
+		}
 		c := count.Nexus3{Nexus3: &n, CsvFile: csv, Sort: sort}
 
 		if err := c.Artifacts(); err != nil {

diff --git a/cmd/n3dr/repositoriesV2.go b/cmd/n3dr/repositoriesV2.go
@@ -69,7 +69,28 @@ Examples:
 			}
 			log.Fatal("One of the required flags \"names\", \"count\" or \"backup\" not set")
 		}
-		n := connection.Nexus3{AwsBucket: awsBucket, AwsID: awsID, AwsRegion: awsRegion, AwsSecret: awsSecret, BasePathPrefix: basePathPrefix, FQDN: n3drURL, Pass: n3drPass, User: n3drUser, DownloadDirName: downloadDirName, DownloadDirNameZip: downloadDirNameZip, HTTPS: https, DockerHost: dockerHost, DockerPort: dockerPort, DockerPortSecure: dockerPortSecure, ZIP: zip, RepoName: n3drRepo, SkipErrors: skipErrors, WithoutWaitGroups: withoutWaitGroups, WithoutWaitGroupArtifacts: withoutWaitGroupArtifacts, WithoutWaitGroupRepositories: withoutWaitGroupRepositories}
+		n := connection.Nexus3{
+			AwsBucket:                    awsBucket,
+			AwsID:                        awsID,
+			AwsRegion:                    awsRegion,
+			AwsSecret:                    awsSecret,
+			BasePathPrefix:               basePathPrefix,
+			DockerHost:                   dockerHost,
+			DockerPort:                   dockerPort,
+			DockerPortSecure:             dockerPortSecure,
+			DownloadDirName:              downloadDirName,
+			DownloadDirNameZip:           downloadDirNameZip,
+			FQDN:                         n3drURL,
+			HTTPS:                        &https,
+			Pass:                         n3drPass,
+			RepoName:                     n3drRepo,
+			SkipErrors:                   skipErrors,
+			User:                         n3drUser,
+			WithoutWaitGroupArtifacts:    withoutWaitGroupArtifacts,
+			WithoutWaitGroupRepositories: withoutWaitGroupRepositories,
+			WithoutWaitGroups:            withoutWaitGroups,
+			ZIP:                          zip,
+		}
 		a := artifactsv2.Nexus3{Nexus3: &n}
 		c := count.Nexus3{Nexus3: &n, CsvFile: csv}
 		nn := name.Nexus3{Nexus3: &n}

diff --git a/cmd/n3dr/sync.go b/cmd/n3dr/sync.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"sync"
 
 	"github.com/030/n3dr/internal/app/n3dr/artifactsv2"
@@ -23,15 +22,23 @@ var syncCmd = &cobra.Command{
 	Short: "sync",
 	Long:  `sync`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("sync called")
 		numberOfURLs := len(otherNexus3URLs)
 		numberOfPasswords := len(otherNexus3Passwords)
 		numberOfUsers := len(otherNexus3Users)
 		if numberOfURLs != numberOfPasswords || numberOfURLs != numberOfUsers {
 			log.Fatal("incorrect number of elements. Ensure that the number of elements is identical")
 		}
 
-		n := connection.Nexus3{FQDN: n3drURL, Pass: n3drPass, User: n3drUser, DownloadDirName: downloadDirName, DockerHost: dockerHost, DockerPort: dockerPort, DockerPortSecure: dockerPortSecure}
+		n := connection.Nexus3{
+			DockerHost:       dockerHost,
+			DockerPort:       dockerPort,
+			DockerPortSecure: dockerPortSecure,
+			DownloadDirName:  downloadDirName,
+			FQDN:             n3drURL,
+			HTTPS:            &https,
+			Pass:             n3drPass,
+			User:             n3drUser,
+		}
 		a := artifactsv2.Nexus3{Nexus3: &n}
 		if err := a.Backup(); err != nil {
 			log.Fatal(err)

diff --git a/configs/.golangci.yml b/configs/.golangci.yml
@@ -133,6 +133,7 @@ linters-settings:
           - github.com/aws/aws-sdk-go/service/s3/s3manager
           - github.com/go-openapi/runtime/client
           - github.com/go-openapi/strfmt
+          - github.com/go-playground/validator/v10
           - github.com/hashicorp/go-retryablehttp
           - github.com/mholt/archiver
           - github.com/mitchellh/go-homedir

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,11 +2,20 @@
 ## [Unreleased]
 
 
-<a name="7.2.5"></a>
-## [7.2.5] - 2023-08-25
-### Build
-- **deps:** Update versions.
+<a name="7.3.1"></a>
+## [7.3.1] - 2023-10-14
+### Fix
+- [[#381](https://github.com/030/n3dr/issues/381)] 405 not allowed when creating repositories as 'https' could not be enabled.
+
 
+<a name="7.3.0"></a>
+## [7.3.0] - 2023-10-14
+### Fix
+- [[#378](https://github.com/030/n3dr/issues/378)] Change initial admin pass (automatically).
+
+
+<a name="7.2.5"></a>
+## [7.2.5] - 2023-08-26
 
 <a name="7.2.4"></a>
 ## [7.2.4] - 2023-07-27
@@ -385,7 +394,9 @@ The `backup`, `upload` and `repositories` commands have been removed.
 <a name="1.0.0"></a>
 ## 1.0.0 - 2019-05-12
 
-[Unreleased]: https://github.com/030/n3dr/compare/7.2.5...HEAD
+[Unreleased]: https://github.com/030/n3dr/compare/7.3.1...HEAD
+[7.3.1]: https://github.com/030/n3dr/compare/7.3.0...7.3.1
+[7.3.0]: https://github.com/030/n3dr/compare/7.2.5...7.3.0
 [7.2.5]: https://github.com/030/n3dr/compare/7.2.4...7.2.5
 [7.2.4]: https://github.com/030/n3dr/compare/7.2.3...7.2.4
 [7.2.3]: https://github.com/030/n3dr/compare/7.2.2...7.2.3

diff --git a/docs/README.md b/docs/README.md
@@ -238,7 +238,7 @@ n3dr config \
 ### Build
 
 ```bash
-docker build -t utrecht/n3dr:7.2.5 .
+docker build -t utrecht/n3dr:7.3.1 .
 ```
 
 [![dockeri.co](https://dockeri.co/image/utrecht/n3dr)](https://hub.docker.com/r/utrecht/n3dr)
@@ -248,7 +248,7 @@ docker build -t utrecht/n3dr:7.2.5 .
 ```bash
 docker run -it \
   -v /home/${USER}/.n3dr:/root/.n3dr \
-  -v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.2.5
+  -v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.3.1
 ```
 
 ### Upload
@@ -257,7 +257,7 @@ docker run -it \
 docker run -it \
   --entrypoint=/bin/ash \
   -v /home/${USER}/.n3dr:/root/.n3dr \
-  -v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.2.5
+  -v /tmp/n3dr:/tmp/n3dr utrecht/n3dr:7.3.1
 ```
 
 navigate to the repository folder, e.g. `/tmp/n3dr/download*/` and upload:

diff --git a/docs/quickstarts/snippets/n3dr/DOWNLOAD.md b/docs/quickstarts/snippets/n3dr/DOWNLOAD.md
@@ -1,12 +1,12 @@
 # Download
 
-Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.2.5):
+Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.3.1):
 
 ```bash
 cd /tmp && \
-curl -L https://github.com/030/n3dr/releases/download/7.2.5/n3dr-ubuntu-latest \
+curl -L https://github.com/030/n3dr/releases/download/7.3.1/n3dr-ubuntu-latest \
   -o n3dr-ubuntu-latest && \
-curl -L https://github.com/030/n3dr/releases/download/7.2.5/\
+curl -L https://github.com/030/n3dr/releases/download/7.3.1/\
 n3dr-ubuntu-latest.sha512.txt \
   -o n3dr-ubuntu-latest.sha512.txt && \
 sha512sum -c n3dr-ubuntu-latest.sha512.txt && \