code fixups

Author: torcolvin

base/bucket_test.go

@@ -471,9 +471,6 @@ func TestBaseBucket(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			baseBucket := GetBaseBucket(test.bucket)
-			_, ok := baseBucket.(*rosmar.Bucket)
-			assert.True(t, ok, "Base bucket is rosmar")
 			_, err := AsRosmarBucket(test.bucket)
 			require.NoError(t, err)
 		})

base/collection.go

@@ -28,7 +28,6 @@ import (
 	"github.com/couchbase/gocb/v2"
 	"github.com/couchbase/gocbcore/v10"
 	sgbucket "github.com/couchbase/sg-bucket"
-	"github.com/couchbaselabs/rosmar"
 	pkgerrors "github.com/pkg/errors"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
@@ -206,15 +205,6 @@ func AsGocbV2Bucket(bucket Bucket) (*GocbV2Bucket, error) {
 	return nil, fmt.Errorf("bucket is not a gocb bucket (type %T)", baseBucket)
 }
 
-// AsRosmar returns a bucket as a rosmar.Bucket, or an error if it is not one.
-func AsRosmarBucket(bucket Bucket) (*rosmar.Bucket, error) {
-	baseBucket := GetBaseBucket(bucket)
-	if rosmarBucket, ok := baseBucket.(*rosmar.Bucket); ok {
-		return rosmarBucket, nil
-	}
-	return nil, fmt.Errorf("bucket is not a rosmar bucket (type %T)", baseBucket)
-}
-
 func (b *GocbV2Bucket) GetName() string {
 	return b.bucket.Name()
 }

base/rosmar_cluster.go

@@ -43,7 +43,7 @@ func NewRosmarCluster(serverURL string) (*RosmarCluster, error) {
 		if runtime.GOOS == "windows" {
 			directory = strings.TrimPrefix(directory, "/")
 		}
-		err = os.MkdirAll(directory, 0750)
+		err = os.MkdirAll(directory, 0700)
 		if err != nil {
 			return nil, fmt.Errorf("could not create or access directory to open rosmar cluster %q: %w", serverURL, err)
 		}

rest/api.go

@@ -286,7 +286,7 @@ func (h *handler) handleFlush() error {
 				return err
 			}
 			defer bucket.Close(h.ctx())
-			// Flush the bucket (assuming it conforms to sgbucket.DeleteableStore interface
+			// Flush the bucket
 			gocbBucket, err := base.AsGocbV2Bucket(bucket)
 			if err != nil {
 				return err