Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 4a6fa5d

Browse files
[Backport 5.1] Fix explicit perms for src expose for Other code host type (#54457)
Fix explicit perms for srce expose for Other code host type ## Test plan Manual <br> Backport 5001b78 from #54447 Co-authored-by: Idan Varsano <[email protected]>
1 parent 2a6dd1f commit 4a6fa5d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

internal/repos/other.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ func (s OtherSource) srcExpose(ctx context.Context) ([]*types.Repo, bool, error)
260260
loggedDeprecationError := false
261261
for _, r := range data.Items {
262262
repo := &types.Repo{
263-
URI: r.URI,
263+
URI: r.URI,
264+
Private: !s.svc.Unrestricted,
264265
}
265266
// The only required fields are URI and ClonePath
266267
if r.URI == "" {

internal/repos/other_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func TestSrcExpose_SrcExposeServer(t *testing.T) {
6666
},
6767
},
6868
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/foo/.git"},
69+
Private: true,
6970
}, {
7071
URI: "/repos/bar/baz",
7172
Name: "/repos/bar/baz",
@@ -81,6 +82,7 @@ func TestSrcExpose_SrcExposeServer(t *testing.T) {
8182
},
8283
},
8384
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/bar/baz/.git"},
85+
Private: true,
8486
}},
8587
}, {
8688
name: "abs-file-path",
@@ -103,6 +105,7 @@ func TestSrcExpose_SrcExposeServer(t *testing.T) {
103105
RelativePath: "/repos/foo/.git",
104106
AbsFilePath: "/src/foo",
105107
},
108+
Private: true,
106109
}},
107110
}, {
108111
name: "override",
@@ -123,6 +126,7 @@ func TestSrcExpose_SrcExposeServer(t *testing.T) {
123126
},
124127
},
125128
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/foo/.git"},
129+
Private: true,
126130
}},
127131
}, {
128132
name: "immutable",
@@ -142,6 +146,7 @@ func TestSrcExpose_SrcExposeServer(t *testing.T) {
142146
},
143147
},
144148
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/foo/.git"},
149+
Private: true,
145150
}},
146151
}}
147152

@@ -219,6 +224,7 @@ func TestSrcExpose_SrcServeLocalServer(t *testing.T) {
219224
},
220225
},
221226
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/foo/.git"},
227+
Private: true,
222228
}, {
223229
URI: "/repos/bar/baz",
224230
Name: "/repos/bar/baz",
@@ -234,6 +240,7 @@ func TestSrcExpose_SrcServeLocalServer(t *testing.T) {
234240
},
235241
},
236242
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/bar/baz/.git"},
243+
Private: true,
237244
}},
238245
}, {
239246
name: "override",
@@ -254,6 +261,7 @@ func TestSrcExpose_SrcServeLocalServer(t *testing.T) {
254261
},
255262
},
256263
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/foo/.git"},
264+
Private: true,
257265
}},
258266
}, {
259267
name: "immutable",
@@ -273,6 +281,7 @@ func TestSrcExpose_SrcServeLocalServer(t *testing.T) {
273281
},
274282
},
275283
Metadata: &extsvc.OtherRepoMetadata{RelativePath: "/repos/foo/.git"},
284+
Private: true,
276285
}},
277286
}}
278287

0 commit comments

Comments
 (0)