Skip to content

Commit 0acf7d5

Browse files
corymhallcorymhall
committed
fixing tests
1 parent 923da17 commit 0acf7d5

File tree

11 files changed

+3
-326
lines changed

11 files changed

+3
-326
lines changed

‎examples/examples_yaml_test.go

Lines changed: 1 addition & 297 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,12 +1101,9 @@ func TestAccDefaultTags(t *testing.T) {
11011101
name: "pf", token: "aws:appconfig:Environment",
11021102
other: `
11031103
app:
1104-
type: aws:appconfig:Application
1105-
properties:
1106-
name: pf-tags-test-app`,
1104+
type: aws:appconfig:Application`,
11071105
properties: map[string]interface{}{
11081106
"applicationId": "${app.id}",
1109-
"name": "pf-tags-test",
11101107
},
11111108
},
11121109
}
@@ -1359,299 +1356,6 @@ outputs:
13591356
}
13601357
}
13611358

1362-
// This replicates the diff when running `pulumi preview` on a aws.rds.Instance with
1363-
// pulumi-aws v6.0.0 and state from pulumi-aws 5.42.0.
1364-
//
1365-
// The first test ensures we don't regress on https://github.com/pulumi/pulumi-aws/issues/2682
1366-
//
1367-
// The second test is when upgrading from pulumi-aws version <5.0.0 to v6.x.x, and
1368-
// prevents regressions on https://github.com/pulumi/pulumi-aws/issues/2823
1369-
//
1370-
// Updated in https://github.com/pulumi/pulumi-aws/pull/3881
1371-
// replacements.
1372-
func TestMigrateRdsInstance(t *testing.T) {
1373-
case1 := `[{
1374-
"method": "/pulumirpc.ResourceProvider/Diff",
1375-
"request": {
1376-
"id": "postgresdb8a8a6f1",
1377-
"urn": "urn:pulumi:dev::ts::aws:rds/instance:Instance::postgresdb",
1378-
"olds": {
1379-
"__meta": "{\"e2bfb730-ecaa-11e6-8f88-34363bc7c4c0\":{\"create\":2400000000000,\"delete\":3600000000000,\"update\":4800000000000},\"schema_version\":\"1\"}",
1380-
"address": "postgresdb8a8a6f1.chuqccm8uxqx.us-west-2.rds.amazonaws.com",
1381-
"allocatedStorage": 30,
1382-
"applyImmediately": false,
1383-
"arn": "arn:aws:rds:us-west-2:616138583583:db:postgresdb8a8a6f1",
1384-
"autoMinorVersionUpgrade": true,
1385-
"availabilityZone": "us-west-2d",
1386-
"backupRetentionPeriod": 0,
1387-
"backupWindow": "06:15-06:45",
1388-
"caCertIdentifier": "rds-ca-2019",
1389-
"characterSetName": "",
1390-
"copyTagsToSnapshot": false,
1391-
"customIamInstanceProfile": "",
1392-
"customerOwnedIpEnabled": false,
1393-
"dbName": "airflow",
1394-
"dbSubnetGroupName": "default",
1395-
"deleteAutomatedBackups": true,
1396-
"deletionProtection": false,
1397-
"domain": "",
1398-
"domainIamRoleName": "",
1399-
"enabledCloudwatchLogsExports": [],
1400-
"endpoint": "postgresdb8a8a6f1.chuqccm8uxqx.us-west-2.rds.amazonaws.com:5432",
1401-
"engine": "postgres",
1402-
"engineVersion": "15.3",
1403-
"engineVersionActual": "15.3",
1404-
"hostedZoneId": "Z1PVIF0B656C1W",
1405-
"iamDatabaseAuthenticationEnabled": false,
1406-
"id": "postgresdb8a8a6f1",
1407-
"identifier": "postgresdb8a8a6f1",
1408-
"identifierPrefix": "",
1409-
"instanceClass": "db.t4g.micro",
1410-
"iops": 0,
1411-
"kmsKeyId": "",
1412-
"latestRestorableTime": "",
1413-
"licenseModel": "postgresql-license",
1414-
"listenerEndpoints": [],
1415-
"maintenanceWindow": "sun:07:16-sun:07:46",
1416-
"masterUserSecrets": [],
1417-
"maxAllocatedStorage": 0,
1418-
"monitoringInterval": 0,
1419-
"monitoringRoleArn": "",
1420-
"multiAz": false,
1421-
"name": "airflow",
1422-
"ncharCharacterSetName": "",
1423-
"networkType": "IPV4",
1424-
"optionGroupName": "default:postgres-15",
1425-
"parameterGroupName": "default.postgres15",
1426-
"password": "tuFp574p9Arw58gu",
1427-
"performanceInsightsEnabled": false,
1428-
"performanceInsightsKmsKeyId": "",
1429-
"performanceInsightsRetentionPeriod": 0,
1430-
"port": 5432,
1431-
"publiclyAccessible": false,
1432-
"replicaMode": "",
1433-
"replicas": [],
1434-
"replicateSourceDb": "",
1435-
"resourceId": "db-DUPUZANEFBXYECMTI2B5RZPTOE",
1436-
"securityGroupNames": [],
1437-
"skipFinalSnapshot": true,
1438-
"status": "available",
1439-
"storageEncrypted": false,
1440-
"storageThroughput": 0,
1441-
"storageType": "gp2",
1442-
"tags": {},
1443-
"tagsAll": {},
1444-
"timezone": "",
1445-
"username": "airflow",
1446-
"vpcSecurityGroupIds": [
1447-
"sg-4d436f12"
1448-
]
1449-
},
1450-
"news": {
1451-
"__defaults": [
1452-
"applyImmediately",
1453-
"autoMinorVersionUpgrade",
1454-
"copyTagsToSnapshot",
1455-
"deleteAutomatedBackups",
1456-
"identifier",
1457-
"monitoringInterval",
1458-
"performanceInsightsEnabled",
1459-
"publiclyAccessible"
1460-
],
1461-
"allocatedStorage": 30,
1462-
"applyImmediately": false,
1463-
"autoMinorVersionUpgrade": true,
1464-
"copyTagsToSnapshot": false,
1465-
"deleteAutomatedBackups": true,
1466-
"engine": "postgres",
1467-
"identifier": "postgresdb8a8a6f1",
1468-
"instanceClass": "db.t4g.micro",
1469-
"monitoringInterval": 0,
1470-
"dbName": "airflow",
1471-
"password": "tuFp574p9Arw58gu",
1472-
"performanceInsightsEnabled": false,
1473-
"publiclyAccessible": false,
1474-
"skipFinalSnapshot": true,
1475-
"username": "airflow"
1476-
},
1477-
"oldInputs": {
1478-
"__defaults": [
1479-
"applyImmediately",
1480-
"autoMinorVersionUpgrade",
1481-
"copyTagsToSnapshot",
1482-
"deleteAutomatedBackups",
1483-
"identifier",
1484-
"monitoringInterval",
1485-
"performanceInsightsEnabled",
1486-
"publiclyAccessible"
1487-
],
1488-
"allocatedStorage": 30,
1489-
"applyImmediately": false,
1490-
"autoMinorVersionUpgrade": true,
1491-
"copyTagsToSnapshot": false,
1492-
"deleteAutomatedBackups": true,
1493-
"engine": "postgres",
1494-
"identifier": "postgresdb8a8a6f1",
1495-
"instanceClass": "db.t4g.micro",
1496-
"monitoringInterval": 0,
1497-
"name": "airflow",
1498-
"password": "tuFp574p9Arw58gu",
1499-
"performanceInsightsEnabled": false,
1500-
"publiclyAccessible": false,
1501-
"skipFinalSnapshot": true,
1502-
"username": "airflow"
1503-
}
1504-
},
1505-
"response": {
1506-
"stables": "*",
1507-
"changes": "*",
1508-
"hasDetailedDiff": true
1509-
}
1510-
}]`
1511-
1512-
case2 := `[{
1513-
"method": "/pulumirpc.ResourceProvider/Diff",
1514-
"request": {
1515-
"id": "rds2f5ed54",
1516-
"urn": "urn:pulumi:exp2::secret-random-yaml::aws:rds/instance:Instance::rds",
1517-
"olds": {
1518-
"__meta": "{\"e2bfb730-ecaa-11e6-8f88-34363bc7c4c0\":{\"create\":2400000000000,\"delete\":3600000000000,\"update\":4800000000000},\"schema_version\":\"1\"}",
1519-
"address": "rds2f5ed54.c1xxca33i6kr.us-east-2.rds.amazonaws.com",
1520-
"allocatedStorage": 16,
1521-
"applyImmediately": false,
1522-
"arn": "arn:aws:rds:us-east-2:616138583583:db:rds2f5ed54",
1523-
"autoMinorVersionUpgrade": true,
1524-
"availabilityZone": "us-east-2c",
1525-
"backupRetentionPeriod": 0,
1526-
"backupWindow": "07:34-08:04",
1527-
"caCertIdentifier": "rds-ca-2019",
1528-
"copyTagsToSnapshot": false,
1529-
"dbSubnetGroupName": "default",
1530-
"deleteAutomatedBackups": true,
1531-
"deletionProtection": false,
1532-
"domain": "",
1533-
"domainIamRoleName": "",
1534-
"enabledCloudwatchLogsExports": [],
1535-
"endpoint": "rds2f5ed54.c1xxca33i6kr.us-east-2.rds.amazonaws.com:3306",
1536-
"engine": "mysql",
1537-
"engineVersion": "8.0.33",
1538-
"hostedZoneId": "Z2XHWR1WZ565X2",
1539-
"iamDatabaseAuthenticationEnabled": false,
1540-
"id": "rds2f5ed54",
1541-
"identifier": "rds2f5ed54",
1542-
"instanceClass": "db.t3.micro",
1543-
"iops": 0,
1544-
"kmsKeyId": "",
1545-
"latestRestorableTime": "0001-01-01T00:00:00Z",
1546-
"licenseModel": "general-public-license",
1547-
"maintenanceWindow": "sun:03:59-sun:04:29",
1548-
"maxAllocatedStorage": 0,
1549-
"monitoringInterval": 0,
1550-
"monitoringRoleArn": "",
1551-
"multiAz": false,
1552-
"name": "name",
1553-
"optionGroupName": "default:mysql-8-0",
1554-
"parameterGroupName": "default.mysql8.0",
1555-
"password": "FOO-BAR-FIZZ1!2",
1556-
"performanceInsightsEnabled": false,
1557-
"performanceInsightsKmsKeyId": "",
1558-
"performanceInsightsRetentionPeriod": 0,
1559-
"port": 3306,
1560-
"publiclyAccessible": false,
1561-
"replicas": [],
1562-
"replicateSourceDb": "",
1563-
"resourceId": "db-N57SF65OZ5KO3TPK73R7DQMLZA",
1564-
"securityGroupNames": [],
1565-
"skipFinalSnapshot": true,
1566-
"status": "available",
1567-
"storageEncrypted": false,
1568-
"storageType": "gp2",
1569-
"tags": {
1570-
"some": "change"
1571-
},
1572-
"timezone": "",
1573-
"username": "root",
1574-
"vpcSecurityGroupIds": [
1575-
"sg-1928d262"
1576-
]
1577-
},
1578-
"news": {
1579-
"__defaults": [
1580-
"applyImmediately",
1581-
"autoMinorVersionUpgrade",
1582-
"copyTagsToSnapshot",
1583-
"deleteAutomatedBackups",
1584-
"identifier",
1585-
"monitoringInterval",
1586-
"performanceInsightsEnabled",
1587-
"publiclyAccessible"
1588-
],
1589-
"allocatedStorage": 16,
1590-
"applyImmediately": false,
1591-
"autoMinorVersionUpgrade": true,
1592-
"copyTagsToSnapshot": false,
1593-
"dbName": "name",
1594-
"deleteAutomatedBackups": true,
1595-
"engine": "mysql",
1596-
"identifier": "rds2f5ed54",
1597-
"instanceClass": "db.t3.micro",
1598-
"monitoringInterval": 0,
1599-
"password": "FOO-BAR-FIZZ1!2",
1600-
"performanceInsightsEnabled": false,
1601-
"publiclyAccessible": false,
1602-
"skipFinalSnapshot": true,
1603-
"tags": {
1604-
"__defaults": [],
1605-
"some": "change"
1606-
},
1607-
"username": "root"
1608-
},
1609-
"oldInputs": {
1610-
"__defaults": [
1611-
"applyImmediately",
1612-
"autoMinorVersionUpgrade",
1613-
"copyTagsToSnapshot",
1614-
"deleteAutomatedBackups",
1615-
"identifier",
1616-
"monitoringInterval",
1617-
"performanceInsightsEnabled",
1618-
"publiclyAccessible"
1619-
],
1620-
"allocatedStorage": 16,
1621-
"applyImmediately": false,
1622-
"autoMinorVersionUpgrade": true,
1623-
"copyTagsToSnapshot": false,
1624-
"deleteAutomatedBackups": true,
1625-
"engine": "mysql",
1626-
"identifier": "rds2f5ed54",
1627-
"instanceClass": "db.t3.micro",
1628-
"monitoringInterval": 0,
1629-
"name": "name",
1630-
"password": "FOO-BAR-FIZZ1!2",
1631-
"performanceInsightsEnabled": false,
1632-
"publiclyAccessible": false,
1633-
"skipFinalSnapshot": true,
1634-
"tags": {
1635-
"__defaults": [],
1636-
"some": "change"
1637-
},
1638-
"username": "root"
1639-
}
1640-
},
1641-
"response": {
1642-
"stables": "*",
1643-
"changes": "*",
1644-
"hasDetailedDiff": true,
1645-
"detailedDiff": "*",
1646-
"diffs": "*"
1647-
}
1648-
}
1649-
]`
1650-
1651-
t.Run("case1", func(t *testing.T) { replay(t, case1) })
1652-
t.Run("case2", func(t *testing.T) { replay(t, case2) })
1653-
}
1654-
16551359
func TestRegressUnknownTags(t *testing.T) {
16561360
repro := `
16571361
[

‎examples/pf-default-tags-yaml/Pulumi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ resources:
77
type: pulumi:providers:aws
88
app:
99
type: aws:appconfig:Application
10-
properties:
11-
name: pf-tags-test-app
1210
res:
1311
type: aws:appconfig:Environment
1412
properties:
1513
applicationId: ${app.id}
16-
name: pf-tags-test
1714
options:
1815
provider: ${aws-provider}
1916
outputs:

‎examples/pf-default-tags-yaml/step1/Pulumi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ resources:
1111
foo: bar
1212
app:
1313
type: aws:appconfig:Application
14-
properties:
15-
name: pf-tags-test-app
1614
res:
1715
type: aws:appconfig:Environment
1816
properties:
1917
applicationId: ${app.id}
20-
name: pf-tags-test
2118
options:
2219
provider: ${aws-provider}
2320
outputs:

‎examples/pf-default-tags-yaml/step2/Pulumi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ resources:
1111
foo: quux
1212
app:
1313
type: aws:appconfig:Application
14-
properties:
15-
name: pf-tags-test-app
1614
res:
1715
type: aws:appconfig:Environment
1816
properties:
1917
applicationId: ${app.id}
20-
name: pf-tags-test
2118
options:
2219
provider: ${aws-provider}
2320
outputs:

‎examples/pf-default-tags-yaml/step3/Pulumi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ resources:
1111
foo: quux
1212
app:
1313
type: aws:appconfig:Application
14-
properties:
15-
name: pf-tags-test-app
1614
res:
1715
type: aws:appconfig:Environment
1816
properties:
1917
applicationId: ${app.id}
20-
name: pf-tags-test
2118
tags:
2219
fizz: buzz
2320
options:

‎examples/pf-default-tags-yaml/step4/Pulumi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ resources:
1111
foo: quux
1212
app:
1313
type: aws:appconfig:Application
14-
properties:
15-
name: pf-tags-test-app
1614
res:
1715
type: aws:appconfig:Environment
1816
properties:
1917
applicationId: ${app.id}
20-
name: pf-tags-test
2118
tags:
2219
fizz: buzz
2320
foo: bar

‎examples/pf-default-tags-yaml/step5/Pulumi.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ resources:
1111
foo: quux
1212
app:
1313
type: aws:appconfig:Application
14-
properties:
15-
name: pf-tags-test-app
1614
res:
1715
type: aws:appconfig:Environment
1816
properties:
1917
applicationId: ${app.id}
20-
name: pf-tags-test
2118
options:
2219
provider: ${aws-provider}
2320
outputs:

0 commit comments

Comments
 (0)