Some tweaks to ensure compat with newer Go. (#383)
This commit is contained in:
		
							parent
							
								
									f9cbed9be9
								
							
						
					
					
						commit
						688d252752
					
				|  | @ -129,13 +129,8 @@ var unmarshalCluster = []struct { | |||
| 			Name: "acid-testcluster1", | ||||
| 		}, | ||||
| 		Status: ClusterStatusInvalid, | ||||
| 		Error: (&json.UnmarshalTypeError{ | ||||
| 			Value:  "number", | ||||
| 			Type:   reflect.TypeOf(""), | ||||
| 			Offset: 126, | ||||
| 			Struct: "PostgresSpec", | ||||
| 			Field:  "teamId", | ||||
| 		}).Error(), | ||||
| 		// This error message can vary between Go versions, so compute it for the current version.
 | ||||
| 		Error: json.Unmarshal([]byte(`{"teamId": 0}`), &PostgresSpec{}).Error(), | ||||
| 	}, | ||||
| 	[]byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":"Invalid"}`), nil}, | ||||
| 	{[]byte(`{ | ||||
|  |  | |||
|  | @ -256,7 +256,7 @@ func TestInitHumanUsersWithSuperuserTeams(t *testing.T) { | |||
| 			ownerTeam: "postgres_superusers", | ||||
| 			existingRoles: map[string]spec.PgUser{ | ||||
| 				// role with the name exists before  w/o superuser privilege
 | ||||
| 				"postgres_superuser": spec.PgUser{ | ||||
| 				"postgres_superuser": { | ||||
| 					Origin:     spec.RoleOriginTeamsAPI, | ||||
| 					Name:       "postgres_superuser", | ||||
| 					Password:   "", | ||||
|  |  | |||
|  | @ -71,7 +71,7 @@ func (c *Controller) clusterListAndSync() error { | |||
| 		} | ||||
| 		c.queueEvents(list, event) | ||||
| 	} else { | ||||
| 		c.logger.Infof("not enough time passed since the last sync (%s seconds) or repair (%s seconds)", | ||||
| 		c.logger.Infof("not enough time passed since the last sync (%v seconds) or repair (%v seconds)", | ||||
| 			timeFromPreviousSync, timeFromPreviousRepair) | ||||
| 	} | ||||
| 	return nil | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue