custom HTTP capabilities moved to their own subpackage

xmidt-org · Aug 20, 2024 · caaa627 · caaa627
1 parent 92ae145
commit caaa627
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 261 deletions.
diff --git a/basculehttp/capabilities.go b/basculehttp/capabilities.go
diff --git a/basculehttp/middleware_test.go b/basculehttp/middleware_test.go
@@ -19,24 +19,6 @@ type MiddlewareTestSuite struct {
 	TestSuite
 }
 
-// newAuthenticator creates a bascule.Authenticator that is expected to be valid.
-// Assertions as to validity are made prior to returning.
-func (suite *MiddlewareTestSuite) newAuthenticator(opts ...bascule.AuthenticatorOption[*http.Request]) *bascule.Authenticator[*http.Request] {
-	a, err := NewAuthenticator(opts...)
-	suite.Require().NoError(err)
-	suite.Require().NotNil(a)
-	return a
-}
-
-// newAuthorizer creates a bascule.Authorizer that is expected to be valid.
-// Assertions as to validity are made prior to returning.
-func (suite *MiddlewareTestSuite) newAuthorizer(opts ...bascule.AuthorizerOption[*http.Request]) *bascule.Authorizer[*http.Request] {
-	a, err := NewAuthorizer(opts...)
-	suite.Require().NoError(err)
-	suite.Require().NotNil(a)
-	return a
-}
-
 // newMiddleware creates a Middleware that is expected to be valid.
 // Assertions as to validity are made prior to returning.
 func (suite *MiddlewareTestSuite) newMiddleware(opts ...MiddlewareOption) *Middleware {

diff --git a/basculehttp/testSuite_test.go b/basculehttp/testSuite_test.go
@@ -62,3 +62,21 @@ func (suite *TestSuite) newAuthorizationParser(opts ...AuthorizationParserOption
 	suite.Require().NotNil(ap)
 	return ap
 }
+
+// newAuthenticator creates a bascule.Authenticator that is expected to be valid.
+// Assertions as to validity are made prior to returning.
+func (suite *MiddlewareTestSuite) newAuthenticator(opts ...bascule.AuthenticatorOption[*http.Request]) *bascule.Authenticator[*http.Request] {
+	a, err := NewAuthenticator(opts...)
+	suite.Require().NoError(err)
+	suite.Require().NotNil(a)
+	return a
+}
+
+// newAuthorizer creates a bascule.Authorizer that is expected to be valid.
+// Assertions as to validity are made prior to returning.
+func (suite *MiddlewareTestSuite) newAuthorizer(opts ...bascule.AuthorizerOption[*http.Request]) *bascule.Authorizer[*http.Request] {
+	a, err := NewAuthorizer(opts...)
+	suite.Require().NoError(err)
+	suite.Require().NotNil(a)
+	return a
+}