Revert use of CWCOW Combined Layers request.

CWCOW specific CombinedLayers request type was added because we needed to include the
containerID in there. However, we are mostly going to need to include the containerID in
all the requests not just this specific one. We will make a separate commit for that
change. Also, the containerID wasn't currently being used anywhere (except for logging) so
it is safe to remove that and just use the existing CombinedLayers request.

Signed-off-by: Amit Barve <ambarve@microsoft.com>

Author: ambarve

internal/gcs-sidecar/handlers.go

@@ -296,10 +296,6 @@ func (b *Bridge) modifySettings(req *request) (err error) {
 
 	if guestResourceType != "" {
 		switch guestResourceType {
-		case guestresource.ResourceTypeCombinedLayers:
-			settings := modifyGuestSettingsRequest.Settings.(*guestresource.WCOWCombinedLayers)
-			log.G(ctx).Tracef("WCOWCombinedLayers: {%v}", settings)
-
 		case guestresource.ResourceTypeNetworkNamespace:
 			settings := modifyGuestSettingsRequest.Settings.(*hcn.HostComputeNamespace)
 			log.G(ctx).Tracef("HostComputeNamespaces { %v}", settings)
@@ -385,33 +381,28 @@ func (b *Bridge) modifySettings(req *request) (err error) {
 			}
 			return nil
 
-		case guestresource.ResourceTypeCWCOWCombinedLayers:
-			settings := modifyGuestSettingsRequest.Settings.(*guestresource.CWCOWCombinedLayers)
-			containerID := settings.ContainerID
-			log.G(ctx).Tracef("CWCOWCombinedLayers:: ContainerID: %v, ContainerRootPath: %v, Layers: %v, ScratchPath: %v",
-				containerID, settings.CombinedLayers.ContainerRootPath, settings.CombinedLayers.Layers, settings.CombinedLayers.ScratchPath)
+		case guestresource.ResourceTypeCombinedLayers:
+			settings := modifyGuestSettingsRequest.Settings.(*guestresource.WCOWCombinedLayers)
+			log.G(ctx).Tracef("CWCOWCombinedLayers:: ContainerRootPath: %v, Layers: %v, ScratchPath: %v",
+				settings.ContainerRootPath, settings.Layers, settings.ScratchPath)
 
 			// TODO: Update modifyCombinedLayers with verified CimFS API
 
 			// The following two folders are expected to be present in the scratch.
 			// But since we have just formatted the scratch we would need to
 			// create them manually.
-			sandboxStateDirectory := filepath.Join(settings.CombinedLayers.ContainerRootPath, sandboxStateDirName)
+			sandboxStateDirectory := filepath.Join(settings.ContainerRootPath, sandboxStateDirName)
 			err = os.Mkdir(sandboxStateDirectory, 0777)
 			if err != nil {
 				return fmt.Errorf("failed to create sandboxStateDirectory: %w", err)
 			}
 
-			hivesDirectory := filepath.Join(settings.CombinedLayers.ContainerRootPath, hivesDirName)
+			hivesDirectory := filepath.Join(settings.ContainerRootPath, hivesDirName)
 			err = os.Mkdir(hivesDirectory, 0777)
 			if err != nil {
 				return fmt.Errorf("failed to create hivesDirectory: %w", err)
 			}
 
-			// Reconstruct WCOWCombinedLayers{} req before forwarding to GCS
-			// as GCS does not understand ResourceTypeCWCOWCombinedLayers
-			modifyGuestSettingsRequest.ResourceType = guestresource.ResourceTypeCombinedLayers
-			modifyGuestSettingsRequest.Settings = settings.CombinedLayers
 			modifyRequest.Request = modifyGuestSettingsRequest
 			buf, err := json.Marshal(modifyRequest)
 			if err != nil {

internal/layers/wcow_mount.go

@@ -524,7 +524,6 @@ func mountHypervIsolatedBlockCIMLayers(ctx context.Context, l *wcowBlockCIMLayer
 		},
 	}
 
-	// TODO(ambarve): Do we need CWCOW specific request type here?
 	err = vm.CombineLayersWCOW(ctx, hcsLayers, ml.RootFS, hcsschema.UnionFS)
 	if err != nil {
 		return nil, nil, err