Skip to content

Use golang/protobuf instead of gogo/protobuf #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ebroberson wants to merge 8 commits into
base: main
Choose a base branch
from
+130 −124
Open

Use golang/protobuf instead of gogo/protobuf #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8cb920f
Updates to match new protobufs
ebroberson Jun 10, 2024
ed1638b
InternalRoutesFromRoutingInfo now takes a pointer
ebroberson Jan 23, 2025
55fe9c7
Merge branch 'main' into protobuf-with-plugin
ebroberson Feb 12, 2025
6b6b363
Merge branch 'main' into protobuf-with-plugin
ebroberson Feb 20, 2025
306c977
Update for new locket protobufs
ebroberson Mar 31, 2025
0fd76f9
Merge branch 'main' into protobuf-with-plugin
ebroberson Apr 8, 2025
5d1dd46
Merge branch 'main' into protobuf-with-plugin
ebroberson Apr 17, 2025
a01dc94
Merge branch 'main' into protobuf-with-plugin
ebroberson Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,13 +372,13 @@ var _ = Describe("Client", func() {
logger = lagertest.NewTestLogger("test")
stopErr error
actualLRP = models.ActualLRP{
ActualLRPKey: models.NewActualLRPKey("some-process-guid", 2, "test-domain"),
ActualLRPInstanceKey: models.NewActualLRPInstanceKey("some-instance-guid", "some-cell-id"),
ActualLrpKey: models.NewActualLRPKey("some-process-guid", 2, "test-domain"),
ActualLrpInstanceKey: models.NewActualLRPInstanceKey("some-instance-guid", "some-cell-id"),
}
)

JustBeforeEach(func() {
stopErr = client.StopLRPInstance(logger, actualLRP.ActualLRPKey, actualLRP.ActualLRPInstanceKey)
stopErr = client.StopLRPInstance(logger, actualLRP.ActualLrpKey, actualLRP.ActualLrpInstanceKey)
})

Context("when the request is successful", func() {
Expand Down
2 changes: 2 additions & 0 deletions cmd/rep/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ dYbCU/DMZjsv+Pt9flhj7ELLo+WKHyI767hJSq9A7IT3GzFt8iGiEAt1qj2yS0DX
return err
}, 10*time.Second).Should(Succeed())
Expect(response.Resource.Key).To(Equal(repConfig.CellID))
//lint:ignore SA1019 - testing deprecated functionality
Expect(response.Resource.Type).To(Equal(locketmodels.PresenceType))
Expect(response.Resource.TypeCode).To(Equal(locketmodels.PRESENCE))
value := &models.CellPresence{}
Expand All @@ -695,6 +696,7 @@ dYbCU/DMZjsv+Pt9flhj7ELLo+WKHyI767hJSq9A7IT3GzFt8iGiEAt1qj2yS0DX
}, 10*time.Second).Should(Succeed())

Expect(response.Resource.Key).To(Equal(repConfig.CellID))
//lint:ignore SA1019 - testing deprecated functionality
Expect(response.Resource.Type).To(Equal(locketmodels.PresenceType))
Expect(response.Resource.TypeCode).To(Equal(locketmodels.PRESENCE))
value := &models.CellPresence{}
Expand Down
52 changes: 27 additions & 25 deletions conversion_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ func ConvertPreloadedRootFS(rootFS string, imageLayers []*models.ImageLayer, lay
newImageLayers := []*models.ImageLayer{}
var newRootFS string
for _, v := range imageLayers {
isExclusiveLayer := v.GetLayerType() == models.LayerTypeExclusive
isMediaTypeTgz := v.GetMediaType() == models.MediaTypeTgz
isSha256 := v.GetDigestAlgorithm() == models.DigestAlgorithmSha256
isExclusiveLayer := v.GetLayerType() == models.ImageLayer_LayerTypeExclusive
isMediaTypeTgz := v.GetMediaType() == models.ImageLayer_MediaTypeTgz
isSha256 := v.GetDigestAlgorithm() == models.ImageLayer_DigestAlgorithmSha256
suitableLayer := isExclusiveLayer && isMediaTypeTgz && isSha256
if suitableLayer && newRootFS == "" {
rootFSArray := strings.Split(rootFS, ":")
Expand Down Expand Up @@ -193,8 +193,8 @@ func (rrch RunRequestConversionHelper) NewRunRequestFromDesiredLRP(
}

metricTags, err := models.ConvertMetricTags(desiredLRP.MetricTags, map[models.MetricTagValue_DynamicValue]any{
models.MetricTagDynamicValueIndex: lrpKey.Index,
models.MetricTagDynamicValueInstanceGuid: lrpInstanceKey.InstanceGuid,
models.MetricTagValue_MetricTagDynamicValueIndex: lrpKey.Index,
models.MetricTagValue_MetricTagDynamicValueInstanceGuid: lrpInstanceKey.InstanceGuid,
})
if err != nil {
return executor.RunRequest{}, err
Expand All @@ -205,7 +205,7 @@ func (rrch RunRequestConversionHelper) NewRunRequestFromDesiredLRP(
return executor.RunRequest{}, err
}

internalRoutes, err := internalroutes.InternalRoutesFromRoutingInfo(*desiredLRP.Routes)
internalRoutes, err := internalroutes.InternalRoutesFromRoutingInfo(desiredLRP.Routes)
if err != nil {
return executor.RunRequest{}, err
}
Expand All @@ -223,6 +223,7 @@ func (rrch RunRequestConversionHelper) NewRunRequestFromDesiredLRP(
},

MetricsConfig: executor.MetricsConfig{
//lint:ignore SA1019 - testing deprecated functionality
Guid: desiredLRP.MetricsGuid,
Index: int(lrpKey.Index),
Tags: metricTags,
Expand Down Expand Up @@ -270,59 +271,59 @@ func (rrch RunRequestConversionHelper) NewRunRequestFromTask(task *models.Task,
taskCopy := *task
task = &taskCopy
task.TaskDefinition = &taskDefinitionCopy
task.RootFs, task.ImageLayers = ConvertPreloadedRootFS(task.RootFs, task.ImageLayers, layeringMode)
task.TaskDefinition.RootFs, task.TaskDefinition.ImageLayers = ConvertPreloadedRootFS(task.TaskDefinition.RootFs, task.TaskDefinition.ImageLayers, layeringMode)
cachedDependencies, setupAction := convertImageLayers(task.TaskDefinition)

mounts, err := convertVolumeMounts(task.VolumeMounts)
mounts, err := convertVolumeMounts(task.TaskDefinition.VolumeMounts)
if err != nil {
return executor.RunRequest{}, err
}

rootFSPath, err := stackPathMap.PathForRootFS(task.RootFs)
rootFSPath, err := stackPathMap.PathForRootFS(task.TaskDefinition.RootFs)
if err != nil {
return executor.RunRequest{}, err
}

metricTags, err := models.ConvertMetricTags(task.MetricTags, map[models.MetricTagValue_DynamicValue]any{})
metricTags, err := models.ConvertMetricTags(task.TaskDefinition.MetricTags, map[models.MetricTagValue_DynamicValue]any{})
if err != nil {
return executor.RunRequest{}, err
}

username, password, err := rrch.convertCredentials(rootFSPath, task.ImageUsername, task.ImagePassword)
username, password, err := rrch.convertCredentials(rootFSPath, task.TaskDefinition.ImageUsername, task.TaskDefinition.ImagePassword)
if err != nil {
return executor.RunRequest{}, err
}

tags := executor.Tags{
ResultFileTag: task.ResultFile,
ResultFileTag: task.TaskDefinition.ResultFile,
}
runInfo := executor.RunInfo{
RootFSPath: rootFSPath,
CPUWeight: uint(task.CpuWeight),
Privileged: task.Privileged,
CPUWeight: uint(task.TaskDefinition.CpuWeight),
Privileged: task.TaskDefinition.Privileged,
LogConfig: executor.LogConfig{
Guid: task.LogGuid,
SourceName: task.LogSource,
Guid: task.TaskDefinition.LogGuid,
SourceName: task.TaskDefinition.LogSource,
Tags: metricTags,
},
MetricsConfig: executor.MetricsConfig{
Guid: task.MetricsGuid,
Guid: task.TaskDefinition.MetricsGuid,
Tags: metricTags,
},
CachedDependencies: ConvertCachedDependencies(cachedDependencies),
Action: task.Action,
Action: task.TaskDefinition.Action,
Setup: setupAction,
Env: executor.EnvironmentVariablesFromModel(task.EnvironmentVariables),
EgressRules: task.EgressRules,
TrustedSystemCertificatesPath: task.TrustedSystemCertificatesPath,
Env: executor.EnvironmentVariablesFromModel(task.TaskDefinition.EnvironmentVariables),
EgressRules: task.TaskDefinition.EgressRules,
TrustedSystemCertificatesPath: task.TaskDefinition.TrustedSystemCertificatesPath,
VolumeMounts: mounts,
Network: convertNetwork(task.Network),
CertificateProperties: convertCertificateProperties(task.CertificateProperties),
Network: convertNetwork(task.TaskDefinition.Network),
CertificateProperties: convertCertificateProperties(task.TaskDefinition.CertificateProperties),
ImageUsername: username,
ImagePassword: password,
EnableContainerProxy: false,
LogRateLimitBytesPerSecond: convertLogRateLimit(task.LogRateLimit),
VolumeMountedFiles: executor.VolumeMountedFilesFromModel(task.VolumeMountedFiles),
LogRateLimitBytesPerSecond: convertLogRateLimit(task.TaskDefinition.LogRateLimit),
VolumeMountedFiles: executor.VolumeMountedFilesFromModel(task.TaskDefinition.VolumeMountedFiles),
}
return executor.NewRunRequest(task.TaskGuid, &runInfo, tags), nil
}
Expand Down Expand Up @@ -351,6 +352,7 @@ func convertImageLayers(t *models.TaskDefinition) ([]*models.CachedDependency, *
layers := models.ImageLayers(t.ImageLayers)

cachedDependencies := append(layers.ToCachedDependencies(), t.CachedDependencies...)
//lint:ignore SA1019 - testing deprecated functionality
action := layers.ToDownloadActions(t.LegacyDownloadUser, nil)

return cachedDependencies, action
Expand Down
Loading