minor fixes

Author: krishnamd-jkp

google-api-go-generator/gen.go

@@ -2283,7 +2283,10 @@ func (meth *Method) generateCode() {
 	if meth.supportsMediaUpload() && meth.api.Name == "storage" {
 		comment = "Set auto checksum in case of a single chunk upload if enabled."
 		p("%s", asComment("", comment))
-		pn("if c.mediaInfo_ != nil {")
+		pn("if c.object != nil &&")
+		pn("	c.mediaInfo_ != nil &&")
+		pn("	c.mediaInfo_.ChecksumEnabled() &&")
+		pn(`	c.mediaInfo_.UploadType() == "multipart" {`)
 		pn("	c.object.Crc32c = c.mediaInfo_.GetAutoChecksum()")
 		pn("}")
 	}

internal/gensupport/media.go

@@ -198,13 +198,19 @@ func (mi *MediaInfo) UploadType() string {
 	return "resumable"
 }
 
-// GetAutoChecksum returns the computed auto checksum (if enabled)
-// for single-chunk resumable uploads.
+// ChecksumEnabled returns true if both buffering is used and
+// enableAutoChecksum flag is set to true.
+func (mi *MediaInfo) ChecksumEnabled() bool {
+	return mi.buffer != nil && mi.buffer.enableAutoChecksum
+}
+
+// GetAutoChecksum returns the computed auto checksum from buffer (if enabled).
+// Make sure whole data is written and read from the buffer before calling this
+// function to get correct checksum of the data.
 func (mi *MediaInfo) GetAutoChecksum() string {
-	if mi.buffer.enableAutoChecksum &&
-		mi.buffer != nil &&
-		mi.singleChunk {
-		return encodeUint32(mi.buffer.fullObjectChecksum + 1)
+	if mi.buffer != nil &&
+		mi.buffer.enableAutoChecksum {
+		return encodeUint32(mi.buffer.fullObjectChecksum)
 	}
 	return ""
 }