feature/lfs-oid-key

client/indexd/convert.go

@@ -4,10 +4,12 @@ package indexd_client
 
 import (
 	"fmt"
+	"net/url"
 
 	"github.com/calypr/git-drs/drs"
 )
 
+// IndexdRecord represents a simplified version of an indexd record for conversion purposes
 func indexdRecordFromDrsObject(drsObj *drs.DRSObject) (*IndexdRecord, error) {
 	indexdObj := &IndexdRecord{
 		Did:      drsObj.Id,
@@ -46,9 +48,20 @@ func indexdRecordToDrsObject(indexdObj *IndexdRecord) (*drs.DRSObject, error) {
 
 func drsAccessMethodsFromIndexdURLs(urls []string, authz []string) ([]drs.AccessMethod, error) {
 	var accessMethods []drs.AccessMethod
-	for _, url := range urls {
+	for _, urlString := range urls {
 		var method drs.AccessMethod
-		method.AccessURL = drs.AccessURL{URL: url}
+		method.AccessURL = drs.AccessURL{URL: urlString}
+
+		parsed, err := url.Parse(urlString)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse url %q: %v", urlString, err)
+		}
+		if parsed.Scheme == "" {
+			// default to https if no scheme or parse error
+			method.Type = "https"
+		} else {
+			method.Type = parsed.Scheme
+		}
 
 		// check if authz is null or 0-length, then error
 		if authz == nil {
@@ -63,6 +76,7 @@ func drsAccessMethodsFromIndexdURLs(urls []string, authz []string) ([]drs.Access
 	return accessMethods, nil
 }
 
+// extract authz values from DRS access methods
 func indexdAuthzFromDrsAccessMethods(accessMethods []drs.AccessMethod) []string {
 	var authz []string
 	for _, drsURL := range accessMethods {