Merge branch 'ef-migrate-final-ruby-spec-tests' into 'main'

Removes final Ruby Spec Tests from this repository

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1368

Merged-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Co-authored-by: e_forbes <eforbes@gitlab.com>

Author: 2 people

.gitlab-ci.yml

@@ -196,7 +196,7 @@ race:
     - .go-matrix-job
     - .test-job
   script:
-    - make test_golang_race
+    - make test_race
 
 code_quality:
   stage: lint

.ruby-version

@@ -1,3 +1,2 @@
-ruby 3.3.10
 golang 1.24.5
 golangci-lint 2.3.1

.tool-versions

@@ -1,11 +1,5 @@
 source 'https://rubygems.org'
 
-group :development, :test do
-  gem 'base64', '~> 0.3.0'
-  gem 'rspec', '~> 3.13.1'
-  gem 'webrick', '~> 1.9', '>= 1.9.1'
-end
-
 group :development, :danger do
   gem 'gitlab-dangerfiles', '~> 4.9.2'
 end

Gemfile

@@ -31,7 +31,6 @@ GEM
     danger-gitlab (8.0.0)
       danger
       gitlab (~> 4.2, >= 4.2.0)
-    diff-lcs (1.5.1)
     faraday (2.13.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
@@ -75,36 +74,19 @@ GEM
     rake (13.2.1)
     rchardet (1.9.0)
     rexml (3.4.1)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.4)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)
     uri (0.13.2)
-    webrick (1.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  base64 (~> 0.3.0)
   gitlab-dangerfiles (~> 4.9.2)
-  rspec (~> 3.13.1)
-  webrick (~> 1.9, >= 1.9.1)
 
 BUNDLED WITH
    2.6.5

Gemfile.lock

@@ -1,4 +1,4 @@
-.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang test_fancy test_golang_fancy coverage coverage_golang setup _script_install make_necessary_dirs build compile check clean install lint
+.PHONY: validate verify verify_ruby verify_golang test test_fancy coverage coverage_golang setup _script_install make_necessary_dirs build compile check clean install lint
 
 FIPS_MODE ?= 0
 OS := $(shell uname | tr A-Z a-z)
@@ -56,39 +56,27 @@ build: compile
 
 validate: verify test
 
-verify: verify_golang
-
-verify_golang:
+verify: 
 	gofmt -s -l $(GO_SOURCES) | awk '{ print } END { if (NR > 0) { print "Please run make fmt"; exit 1 } }'
 
 fmt:
 	gofmt -w -s $(GO_SOURCES)
 
-test: test_ruby test_golang
-
-test_fancy: test_ruby test_golang_fancy
-
-# The Ruby tests are now all integration specs that test the Go implementation.
-test_ruby:
-	bundle exec rspec --color --format d spec
-
-test_golang:
+test: 
 	go test -cover -coverprofile=cover.out -count 1 -tags "$(GO_TAGS)" ./...
 
-test_golang_fancy: ${GOTESTSUM_FILE}
+test_fancy: ${GOTESTSUM_FILE}
 	@${GOTESTSUM_FILE} --version
 	@${GOTESTSUM_FILE} --junitfile ./cover.xml --format pkgname -- -coverprofile=./cover.out -covermode=atomic -count 1 -tags "$(GO_TAGS)" ./...
 
 ${GOTESTSUM_FILE}:
 	mkdir -p $(shell dirname ${GOTESTSUM_FILE})
 	curl -L https://github.com/gotestyourself/gotestsum/releases/download/v${GOTESTSUM_VERSION}/gotestsum_${GOTESTSUM_VERSION}_${OS}_${ARCH}.tar.gz | tar -zOxf - gotestsum > ${GOTESTSUM_FILE} && chmod +x ${GOTESTSUM_FILE}
 
-test_golang_race:
+test_race:
 	go test -race -count 1 ./...
 
-coverage: coverage_golang
-
-coverage_golang:
+coverage: 
 	[ -f cover.out ] && go tool cover -func cover.out
 
 lint:

Makefile

@@ -28,7 +28,6 @@ Development documentation for GitLab Shell [has moved into the `gitlab` reposito
 | `client/` | HTTP and GitLab client logic that is used internally and by other modules, e.g. Gitaly. |
 | `bin/` | Compiled binaries are created here. |
 | `support/` | Scripts and tools that assist in development and/or testing. |
-| `spec/` | Ruby based integration tests. |
 
 ## Building
 

README.md

@@ -473,23 +473,45 @@ func TwoFactorAuthVerifySuccess(t *testing.T) {
 }
 
 func TestGitLfsAuthenticateSuccess(t *testing.T) {
-	handler := customHandler{
-		url: "/api/v4/internal/lfs_authenticate",
-		caller: func(w http.ResponseWriter, _ *http.Request) {
-			fmt.Fprint(w, `{"username": "test-user", "lfs_token": "testlfstoken", "repo_path": "foo", "expires_in": 7200}`)
-		},
-	}
-	client := runSSHD(t, "ed25519", successAPI(t, handler))
+	t.Run("lfs is successfully authed when a correct user is provided", func(t *testing.T) {
+		handler := customHandler{
+			url: "/api/v4/internal/lfs_authenticate",
+			caller: func(w http.ResponseWriter, _ *http.Request) {
+				fmt.Fprint(w, `{"username": "test-user", "lfs_token": "testlfstoken", "repo_path": "foo", "expires_in": 7200}`)
+			},
+		}
+		client := runSSHD(t, "ed25519", successAPI(t, handler))
 
-	session, err := client.NewSession()
-	require.NoError(t, err)
-	defer session.Close()
+		session, err := client.NewSession()
+		require.NoError(t, err)
+		defer session.Close()
 
-	output, err := session.Output("git-lfs-authenticate test-user/repo.git download")
+		output, err := session.Output("git-lfs-authenticate test-user/repo.git download")
 
-	require.NoError(t, err)
-	require.JSONEq(t, `{"header":{"Authorization":"Basic dGVzdC11c2VyOnRlc3RsZnN0b2tlbg=="},"href":"/info/lfs","expires_in":7200}
+		require.NoError(t, err)
+		require.JSONEq(t, `{"header":{"Authorization":"Basic dGVzdC11c2VyOnRlc3RsZnN0b2tlbg=="},"href":"/info/lfs","expires_in":7200}
 `, string(output))
+	})
+
+	t.Run("lfs is not authenticated when a user is not allowed to perform an action", func(t *testing.T) {
+		handler := customHandler{
+			url: "/api/v4/internal/lfs_authenticate",
+			caller: func(w http.ResponseWriter, _ *http.Request) {
+				http.Error(w, "forbidden", http.StatusForbidden)
+			},
+		}
+		client := runSSHD(t, "ed25519", successAPI(t, handler))
+		session, err := client.NewSession()
+		require.NoError(t, err)
+		defer session.Close()
+
+		output, err := session.Output("git-lfs-authenticate test-user/repo.git download")
+
+		// we don't send back an error
+		require.NoError(t, err)
+		// we also ensure that we don't send back any output
+		require.Empty(t, string(output))
+	})
 }
 
 func TestGitReceivePackSuccess(t *testing.T) {

cmd/gitlab-sshd/acceptance_test.go

@@ -2,6 +2,5 @@ pre-push:
   commands:
     test:
       run: make test
-    # Disabled for now as there's _lots_ of linter errors
-    #lint:
-    #  run: make lint
+    lint:
+      run: make lint